Merge remote-tracking branch 'origin/develop' into entitystore_sqlng
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/437d04ce Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/437d04ce Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/437d04ce Branch: refs/heads/develop Commit: 437d04ce696b9ca01ad4992b5286b79b51d07347 Parents: 1f7357c c201ff5 Author: niclas <[email protected]> Authored: Tue Jun 6 08:11:41 2017 +0800 Committer: niclas <[email protected]> Committed: Tue Jun 6 08:11:41 2017 +0800 ---------------------------------------------------------------------- .../manual/AsciidocBuildInfoPlugin.groovy | 10 +- .../api/property/InitialValueProvider.java | 27 --- .../api/property/PropertyDescriptor.java | 2 - .../api/composite/PropertyMapperTest.java | 4 +- .../polygene/bootstrap/MetaInfoDeclaration.java | 8 - .../polygene/bootstrap/MixinDeclaration.java | 4 - .../layered/LayeredApplicationAssembler.java | 17 +- .../layered/LayeredLayerAssembler.java | 8 +- .../runtime/bootstrap/AssemblyHelper.java | 5 +- .../bootstrap/CompositeAssemblyImpl.java | 5 +- .../composite/InterfaceDefaultMethodsMixin.java | 5 +- .../runtime/property/PropertyModel.java | 24 +- .../polygene/test/util/FreePortFinder.java | 2 +- dependencies.gradle | 1 + .../memcache/assembly/MemcacheAssembler.java | 2 +- extensions/entitystore-mongodb/build.gradle | 2 +- .../mongodb/MongoDBEntityStoreTest.java | 15 +- .../MongoDBEntityStoreWithCacheTest.java | 15 +- .../index/solr/EmbeddedSolrService.java | 5 +- .../src/main/docker/mongo/Dockerfile | 16 ++ manual/src/docs/userguide/tools.txt | 12 +- .../apache/polygene/sample/rental/web/Page.java | 6 +- tools/envisage/src/docs/envisage.txt | 10 +- tools/generator-polygene/app/index.js | 13 - .../SerializationModule/bootstrap.tmpl | 10 +- .../SerializationModule/module.js | 2 +- .../StorageModule/bootstrap.tmpl | 11 + .../InfrastructureLayer/StorageModule/module.js | 6 +- .../storage/ds-es-h2sql.properties | 2 +- .../InfrastructureLayer/bootstrap.tmpl | 2 +- .../RestAPIApplication/bootstrap-test.tmpl | 235 ++++++++++++------- .../app/templates/buildtool/gradle-app.tmpl | 2 +- .../templates/buildtool/gradle-bootstrap.tmpl | 2 +- .../src/docs/yeoman_polygene.txt | 25 +- tools/generator-polygene/test/generator_test.js | 102 ++++---- tools/model-detail/src/docs/model-detail.txt | 52 ++++ .../tools/model/DocumentationSupport.java | 118 ++++++++++ .../src/test/resources/doc-support-report.json | 129 ++++++++++ 38 files changed, 622 insertions(+), 294 deletions(-) ----------------------------------------------------------------------
