[causeway] 01/02: Merge remote-tracking branch 'origin/master' into spring6

[ah...@apache.org]

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

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 0483266f1467d569fe509ff07f47a1731de6816a
Merge: 5327823128 d2b5b82a63
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 6 10:11:02 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 .../actions/ActionLayout/ActionLayoutMenu.java     | 133 +++++++++++----------
 .../ActionLayoutAssociateWithVm-description.adoc   |  12 ++
 .../associateWith/ActionLayoutAssociateWithVm.java |  56 +++++++++
 .../ActionLayoutAssociateWithVm.layout.xml         |  67 +++++++++++
 .../actions/ActionLayout/bookmarking/.gitkeep      |   0
 .../ActionLayoutBookmarkingVm-description.adoc     |   9 ++
 .../bookmarking/ActionLayoutBookmarkingVm.java     |  57 +++++++++
 .../ActionLayoutBookmarkingVm.layout.xml           |  67 +++++++++++
 .../domain/actions/ActionLayout/cssClass/.gitkeep  |   0
 .../ActionLayoutCssClassVm-description.adoc        |   7 ++
 .../cssClass/ActionLayoutCssClassVm.java           |  56 +++++++++
 .../cssClass/ActionLayoutCssClassVm.layout.xml     |  67 +++++++++++
 .../actions/ActionLayout/cssClassFa/.gitkeep       |   0
 .../ActionLayoutCssClassFaVm-description.adoc      |  12 ++
 .../cssClassFa/ActionLayoutCssClassFaVm.java       |  58 +++++++++
 .../cssClassFa/ActionLayoutCssClassFaVm.layout.xml |  67 +++++++++++
 .../ActionLayoutDescribedAsVm-description.adoc     |   6 +
 .../describedAs/ActionLayoutDescribedAsVm.java     |  56 +++++++++
 .../ActionLayoutDescribedAsVm.layout.xml           |  67 +++++++++++
 .../ActionLayoutFieldSetVm-description.adoc        |  13 ++
 .../fieldSet/ActionLayoutFieldSetVm.java           |  57 +++++++++
 .../fieldSet/ActionLayoutFieldSetVm.layout.xml     |  67 +++++++++++
 .../domain/actions/ActionLayout/hidden/.gitkeep    |   0
 .../hidden/ActionLayoutHiddenVm-description.adoc   |   6 +
 .../ActionLayout/hidden/ActionLayoutHiddenVm.java  |  57 +++++++++
 .../hidden/ActionLayoutHiddenVm.layout.xml         |  67 +++++++++++
 .../dom/domain/actions/ActionLayout/named/.gitkeep |   0
 .../named/ActionLayoutNamedVm-description.adoc     |   7 ++
 .../ActionLayout/named/ActionLayoutNamedVm.java    |  56 +++++++++
 .../named/ActionLayoutNamedVm.layout.xml           |  67 +++++++++++
 .../actions/ActionLayout/redirectPolicy/.gitkeep   |   0
 .../ActionLayoutRedirectPolicyVm-description.adoc  |   8 ++
 .../ActionLayoutRedirectPolicyVm.java              |  57 +++++++++
 .../ActionLayoutRedirectPolicyVm.layout.xml        |  67 +++++++++++
 .../ActionLayoutSequenceVm-description.adoc        |   7 ++
 .../sequence/ActionLayoutSequenceVm.java           |  56 +++++++++
 .../sequence/ActionLayoutSequenceVm.layout.xml     |  67 +++++++++++
 .../collections/Collection/CollectionMenu.java     |  23 ++--
 .../domain/collections/Collection/hidden/.gitkeep  |   0
 .../hidden/CollectionHiddenVm-description.adoc     |   6 +
 .../Collection/hidden/CollectionHiddenVm.java      |  67 +++++++++++
 .../hidden/CollectionHiddenVm.layout.xml           |  58 +++++++++
 .../domain/collections/Collection/typeOf/.gitkeep  |   0
 .../typeOf/CollectionTypeOfVm-description.adoc     |   7 ++
 .../Collection/typeOf/CollectionTypeOfVm.java      |  66 ++++++++++
 .../typeOf/CollectionTypeOfVm.layout.xml           |  58 +++++++++
 .../DomainObjectLayout/bookmarking/.gitkeep        |   0
 .../objects/DomainObjectLayout/cssClass/.gitkeep   |   0
 .../objects/DomainObjectLayout/cssClassFa/.gitkeep |   0
 .../DomainObjectLayout/describedAs/.gitkeep        |   0
 .../objects/DomainObjectLayout/named/.gitkeep      |   0
 .../objects/DomainObjectLayout/paged/.gitkeep      |   0
 .../objects/DomainObjectLayout/xxxUiEvent/.gitkeep |   0
 .../domain/properties/Property/projecting/.gitkeep |   0
 .../src/main/java/demoapp/dom/menubars.layout.xml  |   3 +
 55 files changed, 1664 insertions(+), 80 deletions(-)

diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
index 0b26e13d3a,7943a29650..bc34b72c0a
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
@@@ -28,9 -27,22 +27,22 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
+ import demoapp.dom.domain.actions.ActionLayout.associateWith.ActionLayoutAssociateWithVm;
+ import demoapp.dom.domain.actions.ActionLayout.bookmarking.ActionLayoutBookmarkingVm;
+ import demoapp.dom.domain.actions.ActionLayout.cssClass.ActionLayoutCssClassVm;
+ import demoapp.dom.domain.actions.ActionLayout.cssClassFa.ActionLayoutCssClassFaVm;
+ import demoapp.dom.domain.actions.ActionLayout.describedAs.ActionLayoutDescribedAsVm;
+ import demoapp.dom.domain.actions.ActionLayout.fieldSet.ActionLayoutFieldSetVm;
+ import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenVm;
+ import demoapp.dom.domain.actions.ActionLayout.named.ActionLayoutNamedVm;
+ import demoapp.dom.domain.actions.ActionLayout.position.ActionLayoutPositionVm;
+ import demoapp.dom.domain.actions.ActionLayout.promptStyle.ActionLayoutPromptStyleVm;
+ import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyVm;
+ import demoapp.dom.domain.actions.ActionLayout.sequence.ActionLayoutSequenceVm;
+ 
  @DomainService(nature=NatureOfService.VIEW)
  @Named("demo.ActionLayoutMenu")
 -@javax.annotation.Priority(PriorityPrecedence.EARLY)
 +@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
  //@Log4j2
  public class ActionLayoutMenu {