You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@isis.apache.org by da...@apache.org on 2021/04/05 10:28:05 UTC

[isis] 01/01: Merge pull request #468 from apache/ISIS-2594

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 1b58dafd5dd5106d56bb3f11a52bfa1337250a58
Merge: 3efc8bc 2bf5b97
Author: Dan Haywood <da...@apache.org>
AuthorDate: Mon Apr 5 11:27:58 2021 +0100

    Merge pull request #468 from apache/ISIS-2594
    
    ISIS-2594: adds EL config props

 core/config/generateConfigDocs.groovy              |  40 +-
 .../src/main/adoc/modules/config/pages/about.adoc  |   9 +-
 .../adoc/modules/config/pages/sections/Other.adoc  | 103 +---
 .../adoc/modules/config/pages/sections/_nav.adoc   |   6 +-
 .../modules/config/pages/sections/datanucleus.adoc |   8 +
 .../modules/config/pages/sections/eclipselink.adoc | 445 +++++++++++++++++
 .../modules/config/pages/sections/resteasy.adoc    |   8 +
 .../isis/core/config/EclipselinkConfiguration.java | 530 +++++++++++++++++++++
 .../apache/isis/core/config/IsisConfiguration.java |  37 ++
 .../isis/core/config/IsisModuleCoreConfig.java     |   8 +-
 .../additional-spring-configuration-metadata.json  | 104 ++++
 preview.sh                                         |   8 +-
 scripts/ci/_build-site.sh                          |   2 +
 13 files changed, 1178 insertions(+), 130 deletions(-)