You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/06 09:15:17 UTC
[causeway] branch spring6 updated (5327823128 -> 89dbfc9e58)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 5327823128 Merge remote-tracking branch 'origin/master' into spring6
add 68093114d9 CAUSEWAY-3314: [Demo] Collection Annotation - adds VM stubs
add d2b5b82a63 CAUSEWAY-3310: [Demo] Action Layout Annotation - add VM stubs
new 0483266f14 Merge remote-tracking branch 'origin/master' into spring6
new 89dbfc9e58 Merge remote-tracking branch 'origin/master' into spring6
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../actions/ActionLayout/ActionLayoutMenu.java | 133 +++++++++++----------
.../ActionLayoutAssociateWithVm-description.adoc | 12 ++
.../associateWith/ActionLayoutAssociateWithVm.java | 56 +++++++++
.../ActionLayoutAssociateWithVm.layout.xml} | 0
.../actions/ActionLayout/bookmarking/.gitkeep | 0
.../ActionLayoutBookmarkingVm-description.adoc | 9 ++
.../bookmarking/ActionLayoutBookmarkingVm.java | 57 +++++++++
.../ActionLayoutBookmarkingVm.layout.xml} | 0
.../domain/actions/ActionLayout/cssClass/.gitkeep | 0
.../ActionLayoutCssClassVm-description.adoc | 7 ++
.../cssClass/ActionLayoutCssClassVm.java | 56 +++++++++
.../ActionLayoutCssClassVm.layout.xml} | 0
.../actions/ActionLayout/cssClassFa/.gitkeep | 0
.../ActionLayoutCssClassFaVm-description.adoc | 12 ++
.../cssClassFa/ActionLayoutCssClassFaVm.java | 58 +++++++++
.../ActionLayoutCssClassFaVm.layout.xml} | 0
.../ActionLayoutDescribedAsVm-description.adoc | 6 +
.../describedAs/ActionLayoutDescribedAsVm.java | 56 +++++++++
.../ActionLayoutDescribedAsVm.layout.xml} | 0
.../ActionLayoutFieldSetVm-description.adoc | 13 ++
.../fieldSet/ActionLayoutFieldSetVm.java | 57 +++++++++
.../ActionLayoutFieldSetVm.layout.xml} | 0
.../domain/actions/ActionLayout/hidden/.gitkeep | 0
.../hidden/ActionLayoutHiddenVm-description.adoc | 6 +
.../ActionLayout/hidden/ActionLayoutHiddenVm.java | 57 +++++++++
.../ActionLayoutHiddenVm.layout.xml} | 0
.../dom/domain/actions/ActionLayout/named/.gitkeep | 0
.../named/ActionLayoutNamedVm-description.adoc | 7 ++
.../ActionLayout/named/ActionLayoutNamedVm.java | 56 +++++++++
.../ActionLayoutNamedVm.layout.xml} | 0
.../actions/ActionLayout/redirectPolicy/.gitkeep | 0
.../ActionLayoutRedirectPolicyVm-description.adoc | 8 ++
.../ActionLayoutRedirectPolicyVm.java | 57 +++++++++
.../ActionLayoutRedirectPolicyVm.layout.xml} | 0
.../ActionLayoutSequenceVm-description.adoc | 7 ++
.../sequence/ActionLayoutSequenceVm.java | 56 +++++++++
.../ActionLayoutSequenceVm.layout.xml} | 0
.../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} | 0
.../domain/collections/Collection/typeOf/.gitkeep | 0
.../typeOf/CollectionTypeOfVm-description.adoc | 7 ++
.../Collection/typeOf/CollectionTypeOfVm.java | 66 ++++++++++
.../typeOf/CollectionTypeOfVm.layout.xml} | 0
.../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, 878 insertions(+), 80 deletions(-)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => associateWith/ActionLayoutAssociateWithVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => bookmarking/ActionLayoutBookmarkingVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => cssClass/ActionLayoutCssClassVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => cssClassFa/ActionLayoutCssClassFaVm.layout.xml} (100%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => describedAs/ActionLayoutDescribedAsVm.layout.xml} (100%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => fieldSet/ActionLayoutFieldSetVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => hidden/ActionLayoutHiddenVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => named/ActionLayoutNamedVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => redirectPolicy/ActionLayoutRedirectPolicyVm.layout.xml} (100%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{position/ActionLayoutPositionVm.layout.xml => sequence/ActionLayoutSequenceVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/{properties/Property/hidden/PropertyHiddenVm.layout.xml => collections/Collection/hidden/CollectionHiddenVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/.gitkeep
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm.java
copy examples/demo/domain/src/main/java/demoapp/dom/domain/{properties/Property/hidden/PropertyHiddenVm.layout.xml => collections/Collection/typeOf/CollectionTypeOfVm.layout.xml} (100%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/.gitkeep
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/.gitkeep
[causeway] 01/02: Merge remote-tracking branch 'origin/master' into spring6
Posted by 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 {
[causeway] 02/02: Merge remote-tracking branch 'origin/master' into spring6
Posted by 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 89dbfc9e58ed7ac04f8b07260d40f04ec9e68929
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 6 10:15:10 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
---
.../associateWith/ActionLayoutAssociateWithVm.java | 10 +++++-----
.../ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java | 10 +++++-----
.../ActionLayout/cssClass/ActionLayoutCssClassVm.java | 10 +++++-----
.../ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java | 10 +++++-----
.../ActionLayout/describedAs/ActionLayoutDescribedAsVm.java | 10 +++++-----
.../ActionLayout/fieldSet/ActionLayoutFieldSetVm.java | 10 +++++-----
.../actions/ActionLayout/hidden/ActionLayoutHiddenVm.java | 10 +++++-----
.../actions/ActionLayout/named/ActionLayoutNamedVm.java | 10 +++++-----
.../redirectPolicy/ActionLayoutRedirectPolicyVm.java | 10 +++++-----
.../ActionLayout/sequence/ActionLayoutSequenceVm.java | 10 +++++-----
.../collections/Collection/hidden/CollectionHiddenVm.java | 12 ++++++------
.../collections/Collection/typeOf/CollectionTypeOfVm.java | 12 ++++++------
12 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm.java
index 54a6cf4ff6..591cc28e02 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.associateWith;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java
index f7ad7c93ea..c63774e441 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking/ActionLayoutBookmarkingVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.bookmarking;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm.java
index cf71a00e3b..0bbcc1888f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.cssClass;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java
index f07070e083..e1856ce4d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.cssClassFa;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm.java
index 60de5fd367..28ec5c7828 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.describedAs;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm.java
index 5d1ff041b6..fca75f43d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.fieldSet;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm.java
index a83faf5108..e1bdbaa98c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.hidden;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm.java
index b98114884d..ee99f30255 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.named;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm.java
index 2e0dbf68b7..118d211a2e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.redirectPolicy;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm.java
index c7d864c102..92bad6da56 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequenceVm.java
@@ -18,11 +18,11 @@
*/
package demoapp.dom.domain.actions.ActionLayout.sequence;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm.java
index 555e7f2d37..0553410031 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenVm.java
@@ -21,12 +21,12 @@ package demoapp.dom.domain.collections.Collection.hidden;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm.java
index b8cbc02dce..8b325a33e3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfVm.java
@@ -21,12 +21,12 @@ package demoapp.dom.domain.collections.Collection.typeOf;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;