[isis] branch master updated (e6959c8 -> 4a6615d)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from e6959c8  ISIS-2222: refactors home page of demo app, using mixins etc for description and sources.
     add 4a6615d  ISIS-2222: fleshes out demo app with stateful view model.

No new revisions were added by this update.

Summary of changes:
 .../dom/_infra/MarkupVariableResolverService.java  |  2 +-
 .../dom/homepage/DemoHomePage-description.adoc     |  4 +-
 .../demoapp/dom/homepage/DemoHomePage-welcome.adoc | 12 +++---
 .../demoapp/dom/homepage/DemoHomePage.layout.xml   |  6 +--
 .../StatefulViewModelUsingJaxb-description.adoc    | 38 +++++++++++++++++++
 .../viewmodels/StatefulViewModelUsingJaxb.java}    | 27 +++++++++-----
 .../StatefulViewModelUsingJaxb.layout.xml}         | 13 ++++---
 .../UuidDemo.java => viewmodels/ViewModels.java}   | 43 ++++++++++------------
 .../main/java/demoapp/webapp/menubars.layout.xml   | 17 +++++----
 .../demo/domain/src/main/resources/application.yml |  4 +-
 10 files changed, 106 insertions(+), 60 deletions(-)
 create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/viewmodels/StatefulViewModelUsingJaxb-description.adoc
 copy examples/{smoketests/src/main/java/org/apache/isis/testdomain/model/layout/LayoutDemo.java => demo/domain/src/main/java/demoapp/dom/viewmodels/StatefulViewModelUsingJaxb.java} (73%)
 copy examples/demo/domain/src/main/java/demoapp/dom/{homepage/DemoHomePage.layout.xml => viewmodels/StatefulViewModelUsingJaxb.layout.xml} (77%)
 copy examples/demo/domain/src/main/java/demoapp/dom/{types/uuid/UuidDemo.java => viewmodels/ViewModels.java} (63%)