This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0276d56b767e0d42332d38cc3f3cd38f15a79322
Merge: d3e8193 5b9720c
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Sat Nov 9 12:31:23 2019 +0000
Merge branch 'ISIS-2174'
.../application/DomainAppApplicationModule.java | 8 +-
.../domainapp/conf/SimpleAppConfiguration.java | 17 +--
.../domainapp/modules/simple/SimpleModule.java | 32 ++++--
extensions/fixtures/pom.xml | 5 +
.../isis/extensions/fixtures/IsisBootFixtures.java | 11 +-
.../fixtures/fixturescripts/FixtureScript.java | 6 +
.../isis/extensions/fixtures/module/Module.java | 65 +++++++++++
.../extensions/fixtures/module/ModuleService.java | 128 +++++++++++++++++++++
extensions/pom.xml | 53 +++++++++
extensions/secman/pom.xml | 30 +++++
extensions/spring/_adoc/antora.yml | 6 +
.../_adoc/modules/ext-spring/_attributes.adoc | 6 +
.../_adoc/modules/ext-spring/attachments/.gitkeep | 0
.../_adoc/modules/ext-spring/examples/.gitkeep | 0
.../_adoc/modules/ext-spring/images/.gitkeep | 0
.../spring/_adoc/modules/ext-spring/nav.adoc | 2 +
.../modules/ext-spring/pages/_attributes.adoc | 4 +
.../_adoc/modules/ext-spring/pages/about.adoc | 6 +
.../modules/ext-spring/partials/_attributes.adoc | 4 +
.../modules/ext-spring/partials/module-nav.adoc | 3 +
extensions/{fixtures => spring}/pom.xml | 36 +-----
.../isis/extensions/spring/ExtSpringModule.java | 16 +--
.../extensions/spring/service/BeanDescriptor.java | 67 +++++++++++
.../extensions/spring/service/ContextBeans.java | 49 ++++++++
.../spring/service/SpringBeansService.java | 62 ++++++++++
25 files changed, 552 insertions(+), 64 deletions(-)
