Merge branch 'es-jooq' into develop # Conflicts: # manual/src/docs/userguide/extensions.txt
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ad658f64 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ad658f64 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ad658f64 Branch: refs/heads/es-sql Commit: ad658f6483fb31507eaffcb5b8de5dffaeed2b9a Parents: 2bef712 9e12cd7 Author: niclas <[email protected]> Authored: Sat Sep 9 10:07:56 2017 +0800 Committer: niclas <[email protected]> Committed: Sat Sep 9 10:07:56 2017 +0800 ---------------------------------------------------------------------- .../org/apache/polygene/api/PolygeneAPI.java | 1 + .../api/association/AssociationDescriptor.java | 8 +- .../api/property/PropertyDescriptor.java | 8 +- .../composite/FragmentInvocationHandler.java | 2 +- .../runtime/methods/AccessibleTest.java | 120 ++++++ .../test/entity/AbstractEntityStoreTest.java | 3 - extensions/entitystore-jooq/build.gradle | 44 +++ extensions/entitystore-jooq/dev-status.xml | 38 ++ .../entitystore-jooq/src/docs/es-jooq.txt | 58 +++ .../entitystore/jooq/AssociationValue.java | 28 ++ .../polygene/entitystore/jooq/BaseEntity.java | 34 ++ .../entitystore/jooq/EntitiesTable.java | 363 +++++++++++++++++++ .../entitystore/jooq/JooqDslContext.java | 58 +++ .../jooq/JooqEntityStoreConfiguration.java | 73 ++++ .../entitystore/jooq/JooqEntityStoreMixin.java | 256 +++++++++++++ .../jooq/JooqEntityStoreService.java | 36 ++ .../polygene/entitystore/jooq/MixinTable.java | 256 +++++++++++++ .../polygene/entitystore/jooq/SqlTable.java | 277 ++++++++++++++ .../polygene/entitystore/jooq/SqlType.java | 141 +++++++ .../polygene/entitystore/jooq/TableFields.java | 69 ++++ .../polygene/entitystore/jooq/TypesTable.java | 189 ++++++++++ .../jooq/assembly/JooqEntityStoreAssembler.java | 77 ++++ .../entitystore/jooq/JooqEntityStoreTest.java | 88 +++++ .../sql/dbcp/DBCPDataSourceServiceImporter.java | 3 +- manual/src/docs/userguide/extensions.txt | 4 + settings.gradle | 1 + 26 files changed, 2221 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ad658f64/manual/src/docs/userguide/extensions.txt ---------------------------------------------------------------------- diff --cc manual/src/docs/userguide/extensions.txt index 928b90e,5026259..82c692b --- a/manual/src/docs/userguide/extensions.txt +++ b/manual/src/docs/userguide/extensions.txt @@@ -105,7 -105,11 +105,11 @@@ include::../../../../extensions/entitys :leveloffset: 2 -include::../../../../extensions/entitystore-jooq/src/docs/es-jooq.txt[] ++include::../../../../extensions/entitystore-sql/src/docs/es-jooq.txt[] + + :leveloffset: 2 + -include::../../../../extensions/entitystore-sql/src/docs/es-sql.txt[] +include::../../../../extensions/entitystore-sqlkv/src/docs/es-sqlkv.txt[] :leveloffset: 2 http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ad658f64/settings.gradle ----------------------------------------------------------------------
