You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by jo...@apache.org on 2023/04/26 13:02:27 UTC

[causeway] branch CAUSEWAY-3264 created (now 7f22191543)

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

joergrade pushed a change to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git


      at 7f22191543 CAUSEWAY-2485: reorgs imports

This branch includes the following new commits:

     new b2f92ac1ef CAUSEWAY-3264 vega 1/n, asciidoctor
     new 166659749b CAUSEWAY-3264 vega 1/n, asciidoctor, merge origin/spring6
     new 3c448fa39e Merge remote-tracking branch 'origin/spring6' into CAUSEWAY-3264
     new e105ed21a4 Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264
     new fe10fba40f Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264
     new 7f22191543 CAUSEWAY-2485: reorgs imports

The 6 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.



[causeway] 06/06: CAUSEWAY-2485: reorgs imports

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 7f221915436aa2c3579b9c3b4c8c98efac86da47
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Apr 16 15:25:24 2023 +0200

    CAUSEWAY-2485: reorgs imports
    
    (cherry picked from commit e0e6dc15107f1b33dad6e700b45f5fbfa118bdba)
---
 .../src/main/java/demoapp/dom/DemoModuleJpa.java   |   8 +-
 .../dom/_infra/values/ValueHolderRepository.java   |   3 +-
 .../Action/choicesFrom/ActionChoicesFromPage.java  |  10 +-
 .../choicesFrom/ActionChoicesFromSeeding.java      |   2 +-
 .../choicesFrom/jpa/ActionChoicesFromJpa.java      |  12 +-
 .../ActionCommandPublishingPage.java               |  10 +-
 .../ActionCommandPublishingSeeding.java            |   2 +-
 .../jpa/ActionCommandPublishingJpa.java            |  12 +-
 .../Action/domainEvent/ActionDomainEventPage.java  |  12 +-
 .../ActionExecutionPublishingPage.java             |  10 +-
 .../ActionExecutionPublishingSeeding.java          |   2 +-
 ...ExecutionPublishing_changeNameNotPublished.java |   2 +-
 ...ionExecutionPublishing_changeNamePublished.java |   2 +-
 .../jpa/ActionExecutionPublishingJpa.java          |  12 +-
 .../Action/hidden/ActionHiddenPage_objects.java    |  28 ++++
 .../ActionLayoutAssociateWithPage.java             |  12 +-
 .../child/ActionLayoutAssociateWithChildVm.java    |  12 +-
 .../cssClass/ActionLayoutCssClassPage.java         |  12 +-
 .../cssClassFa/ActionLayoutCssClassFaPage.java     |  12 +-
 .../describedAs/ActionLayoutDescribedAsPage.java   |  15 ++-
 .../child/ActionLayoutDescribedAsChildVm.java      |  12 +-
 .../hidden/ActionLayoutHiddenPage.java             |  10 +-
 .../hidden/ActionLayoutHiddenSeeding.java          |   2 +-
 .../hidden/jpa/ActionLayoutHiddenJpa.java          |  12 +-
 ...youtPositionPage_updateNamePositionedPanel.java |  41 +++---
 ...outPositionPage_updateNotesPositionedBelow.java |  25 ++--
 .../child/ActionLayoutSequenceChildVm.java         |  36 +++---
 .../collections/Collection/CollectionMenu.java     |  13 +-
 .../domainEvent/CollectionDomainEventPage.java     |  14 +-
 ...ctionDomainEventPage_changeControlStrategy.java |   2 +-
 .../CollectionDomainEventPage_controlStrategy.java |   2 +-
 .../Collection/hidden/CollectionHiddenPage.java}   |  51 ++++----
 .../objects/DomainObject/DomainObjectMenu.java     |  11 +-
 .../DomainObject/aliased/DomainObjectAliased.java  |   2 +-
 .../aliased/DomainObjectAliasedPage.java           |  10 +-
 .../aliased/DomainObjectAliasedSeeding.java        |   2 +-
 .../aliased/jpa/DomainObjectAliasedJpa.java        |  12 +-
 .../autoComplete/DomainObjectAutoCompletePage.java |  10 +-
 .../DomainObjectAutoCompleteRepository.java        |   2 +
 .../DomainObjectAutoCompleteSeeding.java           |   2 +-
 .../jpa/DomainObjectAutoCompleteJpa.java           |  12 +-
 .../bounded/DomainObjectBoundingPage.java          |  10 +-
 .../bounded/DomainObjectBoundingSeeding.java       |   2 +-
 .../bounded/jpa/DomainObjectBoundingJpa.java       |  12 +-
 .../editing/DomainObjectEditingPage.java           |  12 +-
 .../editing/DomainObjectEditingSeeding.java        |   2 +-
 .../editing/jpa/DomainObjectEditingJpa.java        |  12 +-
 .../DomainObjectEntityChangePublishingEntity.java  |   2 +-
 .../DomainObjectEntityChangePublishingSeeding.java |   2 +-
 .../DomainObjectEntityChangePublishingVm.java      |  10 +-
 .../jdo/DomainObjectEntityChangePublishingJdo.java |   2 +-
 .../jpa/DomainObjectEntityChangePublishingJpa.java |  12 +-
 .../DomainObjectIntrospectionPage.java             |  10 +-
 .../DomainObjectIntrospectionAnnotOptSeeding.java  |   2 +-
 .../jpa/DomainObjectIntrospectionAnnotOptJpa.java  |  12 +-
 .../DomainObjectIntrospectionAnnotReqdSeeding.java |   2 +-
 .../jpa/DomainObjectIntrospectionAnnotReqdJpa.java |  12 +-
 ...mainObjectIntrospectionEncapsulatedSeeding.java |   2 +-
 .../DomainObjectIntrospectionEncapsulatedJpa.java  |  12 +-
 ...ObjectIntrospectionVm_encapsulationEnabled.java |   2 +
 .../mixinMethod/DomainObjectMixinMethodPage.java   |  10 +-
 .../DomainObjectMixinMethodSeeding.java            |   2 +-
 .../jpa/DomainObjectMixinMethodJpa.java            |  12 +-
 .../nature/DomainObjectNaturePage.java             |  10 +-
 .../entity/DomainObjectNatureEntitySeeding.java    |   2 +-
 .../nature/entity/jpa/DomainObjectNatureJpa.java   |  14 +-
 .../viewmodel/DomainObjectNatureViewModel.java     |  18 +--
 ...omainObjectXxxDomainEventControlSubscriber.java |   2 +-
 .../DomainObjectXxxDomainEventPage.java            |  14 +-
 ...ctXxxDomainEventPage_changeControlStrategy.java |   2 +-
 ...inObjectXxxDomainEventPage_controlStrategy.java |   2 +-
 .../child/DomainObjectXxxDomainEventChildVm.java   |  12 +-
 .../DomainObjectLifecycleEventVm.java              |  10 +-
 .../DomainObjectXxxLifecycleEvent.java             |   1 +
 .../DomainObjectXxxLifecycleEventPage.java         |  12 +-
 ...ainObjectXxxLifecycleEventPage_clearEvents.java |   2 +-
 ...inObjectXxxLifecycleEventPage_createEntity.java |   2 +-
 ...inObjectXxxLifecycleEventPage_deleteEntity.java |   2 +-
 .../DomainObjectXxxLifecycleEventSubscriber.java   |   2 +-
 .../jpa/DomainObjectXxxLifecycleEventJpa.java      |  12 +-
 .../DomainObjectLayout/DomainObjectLayoutMenu.java |   4 +-
 .../DomainObjectLayoutBookmarkingNestedVm.java     |  12 +-
 .../DomainObjectLayoutBookmarkingPage.java         |  10 +-
 .../DomainObjectLayoutBookmarkingSeeding.java      |   2 +-
 .../DomainObjectLayoutBookmarking_addChildren.java |   2 +-
 .../jpa/DomainObjectLayoutBookmarkingChildJpa.java |  16 +--
 .../jpa/DomainObjectLayoutBookmarkingJpa.java      |  16 +--
 .../cssClass/DomainObjectLayoutCssClassPage.java   |  10 +-
 .../DomainObjectLayoutCssClassSeeding.java         |   2 +-
 .../jpa/DomainObjectLayoutCssClassJpa.java         |  12 +-
 .../DomainObjectLayoutCssClassFaPage.java          |  10 +-
 .../DomainObjectLayoutCssClassFaSeeding.java       |   2 +-
 .../jpa/DomainObjectLayoutCssClassFaJpa.java       |  12 +-
 .../DomainObjectLayoutDescribedAsPage.java         |  10 +-
 .../DomainObjectLayoutDescribedAsSeeding.java      |   2 +-
 .../jpa/DomainObjectLayoutDescribedAsJpa.java      |  12 +-
 .../named/DomainObjectLayoutNamedPage.java         |  10 +-
 .../named/DomainObjectLayoutNamedSeeding.java      |   2 +-
 .../named/jpa/DomainObjectLayoutNamedJpa.java      |  12 +-
 .../paged/DomainObjectLayoutPagedPage.java         |  10 +-
 .../paged/DomainObjectLayoutPagedSeeding.java      |   2 +-
 .../paged/jpa/DomainObjectLayoutPagedJpa.java      |  12 +-
 .../DomainObjectLayoutTableDecoratorPage.java      |  10 +-
 ...tTableDecoratorPage_actionReturningObjects.java |   2 +-
 .../DomainObjectLayoutTableDecoratorSeeding.java   |   2 +-
 .../jpa/DomainObjectLayoutTableDecoratorJpa.java   |  12 +-
 .../DomainObjectLayoutXxxUiEventPage.java          |  10 +-
 .../DomainObjectLayoutXxxUiEventSeeding.java       |   2 +-
 .../DomainObjectLayoutXxxUiEventSubscriber.java    |   4 +-
 .../jpa/DomainObjectLayoutXxxUiEventJpa.java       |  12 +-
 .../embedded/embedded/EmbeddedTypeMenu.java        |   6 +-
 .../embedded/embedded/jdo/NumberConstantJdo.java   |   2 +-
 .../embedded/embedded/jpa/ComplexNumberJpa.java    |   9 +-
 .../embedded/embedded/jpa/NumberConstantJpa.java   |  19 +--
 .../embedded/persistence/NumberConstantEntity.java |   2 +-
 .../persistence/NumberConstantSeeding.java         |   2 +-
 .../progmodel/objects/mixins/mixins/MixinMenu.java |   4 +-
 .../progmodel/objects/mixins/mixins/MixinVm.java   |  10 +-
 .../domain/properties/Property/PropertyMenu.java   |  77 +++++++----
 .../PropertyCommandPublishingPage.java             |  10 +-
 .../PropertyCommandPublishingSeeding.java          |   2 +-
 .../jpa/PropertyCommandPublishingJpa.java          |  12 +-
 .../PropertyDomainEventControlSubscriber.java      |   2 +-
 .../domainEvent/PropertyDomainEventPage.java       |  12 +-
 ...pertyDomainEventPage_changeControlStrategy.java |   2 +-
 .../PropertyDomainEventPage_controlStrategy.java   |   2 +-
 .../Property/editing/PropertyEditingPage.java      |  62 ++++++++-
 .../Property/editing/PropertyEditingSeeding.java   |  12 +-
 .../Property/editing/jpa/PropertyEditingJpa.java   |  65 +++++-----
 .../PropertyEditingReasonDisabledPage.java         |  97 ++++++++++++++
 .../PropertyExecutionPublishingPage.java           |  10 +-
 .../PropertyExecutionPublishingSeeding.java        |   2 +-
 .../jpa/PropertyExecutionPublishingJpa.java        |  12 +-
 .../hidden/PropertyHiddenPage_objects.java         |  28 ++++
 .../jpa/PropertyHiddenJpaEntities.java}            |  29 ++++-
 .../optionality/PropertyOptionalityPage.java       |   3 +-
 .../projecting/PropertyProjectingChildVm.java      |  48 +++++--
 .../projecting/PropertyProjectingPage.java         |  15 ++-
 .../PropertyProjectingPage_returnsChildren.java    |   2 +
 .../projecting/jdo/PropertyProjectingChildJdo.java |   6 +-
 .../projecting/jpa/PropertyProjectingChildJpa.java |  16 +--
 .../Property/snapshot/PropertySnapshotPage.java    |  96 +++++++++-----
 .../Property/snapshot/PropertySnapshotSeeding.java |  10 +-
 .../Property/snapshot/jpa/PropertySnapshotJpa.java |  32 ++---
 .../snapshot/jpa/PropertySnapshotJpaEntities.java  |  29 ++++-
 .../PropertyLayout/PropertyLayoutMenu.java         |   5 +-
 .../hidden/PropertyLayoutHiddenPage.java           |  10 +-
 .../hidden/PropertyLayoutHiddenSeeding.java        |   2 +-
 .../PropertyLayout/navigable/FileNodeVm.java       |  25 ++--
 .../renderDay/PropertyLayoutRenderDayPage.java     | 141 +++++++++++++++++++++
 .../demoapp/dom/services/core/ServicesMenu.java    |  28 +++-
 .../EventSubscriberDemoImplementation.java         |   4 +-
 .../xmlSnapshotService/XmlSnapshotParentVm.java}   |  65 ++++++----
 .../core/xmlSnapshotService/class-diagram.svg      |  40 ++++++
 .../peer/XmlSnapshotPeerVm.java}                   |  48 ++++---
 .../peer/child/XmlSnapshotPeerChildVm.java}        |  32 ++---
 .../dom/types/causeway/treenode/FileNodeType.java  |  34 +++--
 .../java/demoapp/web/DemoAppManifestCommon.java    |   5 +-
 .../webapp/wicket/jpa/DemoAppWicketJpa.java        |   5 -
 159 files changed, 1379 insertions(+), 796 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 428aa868d1..3c64a86084 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -29,6 +29,7 @@ import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistence
 import demoapp.dom.domain.actions.Action.choicesFrom.jpa.ActionChoicesFromJpa;
 import demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpa;
 import demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpa;
+import demoapp.dom.domain.actions.Action.hidden.jpa.ActionHiddenJpa;
 import demoapp.dom.domain.actions.ActionLayout.hidden.jpa.ActionLayoutHiddenJpa;
 import demoapp.dom.domain.objects.DomainObject.aliased.jpa.DomainObjectAliasedJpa;
 import demoapp.dom.domain.objects.DomainObject.autoComplete.jpa.DomainObjectAutoCompleteJpa;
@@ -52,10 +53,9 @@ import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jpa.DomainObjectLa
 import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jpa.DomainObjectLayoutXxxUiEventJpa;
 import demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa.NumberConstantJpa;
 import demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpa;
-import demoapp.dom.domain.properties.Property.editing.jpa.PropertyEditingJpa;
 import demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpa;
+import demoapp.dom.domain.properties.Property.hidden.jpa.PropertyHiddenJpa;
 import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpa;
-import demoapp.dom.domain.properties.Property.snapshot.jpa.PropertySnapshotJpa;
 import demoapp.dom.domain.properties.PropertyLayout.hidden.jpa.PropertyLayoutHiddenJpa;
 import demoapp.dom.services.core.eventbusservice.EventLogEntryJpa;
 import demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpa;
@@ -135,14 +135,14 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa;
         ActionChoicesFromJpa.class,
         ActionCommandPublishingJpa.class,
         ActionExecutionPublishingJpa.class,
+        ActionHiddenJpa.class,
 
         ActionLayoutHiddenJpa.class,
 
         PropertyCommandPublishingJpa.class,
-        PropertyEditingJpa.class,
         PropertyExecutionPublishingJpa.class,
         PropertyProjectingChildJpa.class,
-        PropertySnapshotJpa.class,
+        PropertyHiddenJpa.class,
 
         PropertyLayoutHiddenJpa.class,
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
index 74e315d6f5..b4cd1cf53e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/values/ValueHolderRepository.java
@@ -28,12 +28,13 @@ import jakarta.inject.Inject;
 
 import org.apache.causeway.applib.services.repository.RepositoryService;
 
-import demoapp.dom.types.Samples;
 import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
+import demoapp.dom.types.Samples;
+
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class ValueHolderRepository<T, E extends ValueHolder<T>> {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
index e5287a1f39..54700e37f4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromSeeding.java
index d7b0490848..2dbc862668 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromJpa.java
index 9201d130f4..6817e1d9a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.choicesFrom.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
index bf4a7546b8..7c32ba209f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingSeeding.java
index 1c4bb3787d..969d4ccffa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index 356291be2d..61bb784c96 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.commandPublishing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
index c14f23b1fb..37dc65b7ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.domainEvent;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
index 8eed497b2b..598f2975de 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingSeeding.java
index c6f9ef0903..42bdc98f12 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNameNotPublished.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNameNotPublished.java
index 562db5f0e8..93614cd405 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNameNotPublished.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNameNotPublished.java
@@ -19,7 +19,7 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNamePublished.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNamePublished.java
index fdc207948e..b9c13cab45 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNamePublished.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishing_changeNamePublished.java
@@ -19,7 +19,7 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index 9c0178863d..40bc46c000 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.Action.executionPublishing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage_objects.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage_objects.java
new file mode 100644
index 0000000000..fbb3fd60ef
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage_objects.java
@@ -0,0 +1,28 @@
+package demoapp.dom.domain.actions.Action.hidden;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.MemberSupport;
+
+import lombok.RequiredArgsConstructor;
+
+import demoapp.dom._infra.values.ValueHolderRepository;
+
+//tag::class[]
+@Collection()
+@RequiredArgsConstructor
+public class ActionHiddenPage_objects {
+
+    @SuppressWarnings("unused")
+    private final ActionHiddenPage page;
+
+    @MemberSupport public List<? extends ActionHidden> coll() {
+        return objectRepository.all();
+    }
+
+    @Inject ValueHolderRepository<String, ? extends ActionHidden> objectRepository;
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
index 5cf0825458..daa7a66bc3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
@@ -21,12 +21,12 @@ package demoapp.dom.domain.actions.ActionLayout.associateWith;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.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/associateWith/child/ActionLayoutAssociateWithChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
index b03e7a9bfa..18f0f0d2e2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.associateWith.child;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
index dd0b66d855..9afaf34c6c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.cssClass;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.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/ActionLayoutCssClassFaPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
index 20de4ca892..fee3a743f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.cssClassFa;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.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/ActionLayoutDescribedAsPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
index 466087f5c2..999f907c6b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
@@ -22,12 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -59,7 +59,8 @@ public class ActionLayoutDescribedAsPage
 {
     @Property
     @XmlElement
-    @Getter @Setter
+    @Getter
+    @Setter
     private String name;
 
     @Collection()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
index 4a2b4793c5..98b76f7173 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.describedAs.child;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
index 41338cda6d..dd2a8bc0f3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenSeeding.java
index c44d2286fe..e5e8394a53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenJpa.java
index e195563d6e..88bde11467 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.actions.ActionLayout.hidden.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNamePositionedPanel.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNamePositionedPanel.java
index 1daff5460e..4dbd5ecf25 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNamePositionedPanel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNamePositionedPanel.java
@@ -16,33 +16,36 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.actions.ActionLayout.position;
+package demoapp.dom.domain.actions.Action.hidden;
 
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.SemanticsOf;
+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 lombok.RequiredArgsConstructor;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.ObjectSupport;
 
+import lombok.NoArgsConstructor;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
+@XmlRootElement(name = "root")
+@XmlType
+@XmlAccessorType(XmlAccessType.FIELD)
+@Named("demo.ActionHiddenPage")
+@DomainObject(
+    nature=Nature.VIEW_MODEL)
+@NoArgsConstructor
 //tag::class[]
-@Action(semantics = SemanticsOf.IDEMPOTENT)
-@ActionLayout(
-        position = ActionLayout.Position.PANEL,
-        associateWith = "name")
-@RequiredArgsConstructor
-public class ActionLayoutPositionPage_updateNamePositionedPanel {
+public class ActionHiddenPage implements HasAsciiDocDescription {
     // ...
 //end::class[]
-    private final ActionLayoutPositionPage page;
 
-    @MemberSupport public ActionLayoutPositionPage act(final String newValue) {
-        page.setName(newValue);
-        return page;
-    }
-    @MemberSupport public String default0Act() {
-        return page.getName();
+    @ObjectSupport public String title() {
+        return "@Action#hidden";
     }
 
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNotesPositionedBelow.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNotesPositionedBelow.java
index 7616176508..9edecd490d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNotesPositionedBelow.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage_updateNotesPositionedBelow.java
@@ -1,3 +1,4 @@
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
@@ -16,31 +17,31 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.actions.ActionLayout.position;
+package demoapp.dom.domain.actions.Action.hidden;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
 
-
 //tag::class[]
-@Action(semantics = SemanticsOf.IDEMPOTENT)
+@Action()                    // <.>
 @RequiredArgsConstructor
-public class ActionLayoutPositionPage_updateNotesPositionedBelow {
+public class ActionHidden_changeName {
     // ...
 //end::class[]
-    private final ActionLayoutPositionPage page;
 
-    @MemberSupport public ActionLayoutPositionPage act(final String newValue) {
-        page.setNotes(newValue);
-        return page;
-    }
-    @MemberSupport public String default0Act() {
-        return page.getNotes();
+    private final ActionHidden entity;
+
+    @MemberSupport public ActionHidden act(
+            final String newName) {
+        entity.setName(newName);
+        return entity;
     }
 
+    public String default0Act() {
+        return entity.getName();
+    }
 //tag::class[]
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
index 37c11f71e4..d882b57bb2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
@@ -16,43 +16,47 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.actions.ActionLayout.sequence.child;
+package demoapp.dom.services.core.xmlSnapshotService.child;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Title;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.*;
-
-import org.apache.causeway.applib.annotation.*;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
 //tag::class[]
 @XmlRootElement(name = "child")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.ActionLayoutSequenceChildVm")
-@DomainObject(nature=Nature.VIEW_MODEL)
+@Named("demo.XmlSnapshotChildVm")
+@DomainObject(
+        nature=Nature.VIEW_MODEL)
 @NoArgsConstructor
-public class ActionLayoutSequenceChildVm implements HasAsciiDocDescription {
+public class XmlSnapshotChildVm implements HasAsciiDocDescription {
 
-    public ActionLayoutSequenceChildVm(final String value) {
+    public XmlSnapshotChildVm(final String value) {
         setValue(value);
     }
 
-    @ObjectSupport public String title() {
-        return getValue();
-    }
-
+    @Title
     @Property()
     @PropertyLayout(fieldSetId = "annotation", sequence = "1")
     @XmlElement(required = false)
     @Getter @Setter
     private String value;
 
-
-
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
index 1d0e5802bb..ae90553da6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.collections.Collection;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -33,13 +33,14 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventPage;
+import demoapp.dom.domain.collections.Collection.hidden.CollectionHiddenPage;
 import demoapp.dom.domain.collections.Collection.typeOf.CollectionTypeOfPage;
 
 @Named("demo.CollectionMenu")
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 //@Log4j2
 public class CollectionMenu {
@@ -59,6 +60,12 @@ public class CollectionMenu {
         return page;
     }
 
+    @Action(semantics = SemanticsOf.SAFE)
+    @ActionLayout(cssClassFa="fa-glasses", describedAs = "Visibility of collections")
+    public CollectionHiddenPage hidden(){
+        return new CollectionHiddenPage();
+    }
+
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-shapes", describedAs = "Element type of collections")
     public CollectionTypeOfPage typeOf(){
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
index 63e1136a52..46b34f3cbe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.collections.Collection.domainEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementWrapper;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.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/domainEvent/CollectionDomainEventPage_changeControlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
index ab4ab96a48..1fc427ab00 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 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/domainEvent/CollectionDomainEventPage_controlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
index 9e29e1cda6..f69c4dca09 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.collections.Collection.domainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
similarity index 61%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
index d2a7664029..f9c268968e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
@@ -16,61 +16,54 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.projecting;
+package demoapp.dom.domain.collections.Collection.hidden;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementWrapper;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+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 org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Where;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain._entities.DemoEntity;
 
 //tag::class[]
-@XmlRootElement(name = "root")
-@XmlType
-@XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.PropertyProjectingVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL,
         editing = Editing.ENABLED)
+@Named("demo.CollectionHiddenVm")
+@XmlRootElement(name = "root")
+@XmlType
+@XmlAccessorType(XmlAccessType.FIELD)
 @NoArgsConstructor
-public class PropertyProjectingPage implements HasAsciiDocDescription {
+public class CollectionHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "@Property#projecting";
-    }
-
-//tag::property[]
-    @PropertyLayout(fieldSetId = "properties", sequence = "1")
-    public PropertyProjectingChildVm getFirstChild() {
-        return getChildren().get(0);
+        return "@Collection#hidden";
     }
-//end::property[]
 
-//tag::children[]
-    @Collection
-    @XmlElementWrapper(name = "children")
-    @XmlElement(name = "child")
+//tag::collection[]
+    @Collection // TODO Collection's hidden attribute will be removed in 2.0
+    @CollectionLayout(hidden = Where.PARENTED_TABLES)
+    @XmlTransient
     @Getter @Setter
-    private List<PropertyProjectingChildVm> children = new ArrayList<>();
-//end::children[]
-
+    private List<DemoEntity> collection = new ArrayList<>();
+//end::collection[]
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
index 74782fa13b..63be00bd5d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.objects.DomainObject;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -28,6 +28,9 @@ import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
 import demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedPage;
 import demoapp.dom.domain.objects.DomainObject.autoComplete.DomainObjectAutoCompletePage;
 import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingPage;
@@ -38,14 +41,12 @@ import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMeth
 import demoapp.dom.domain.objects.DomainObject.nature.DomainObjectNaturePage;
 import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.DomainObjectXxxDomainEventPage;
 import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventPage;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
 
 @Named("demo.DomainObjectMenu")
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class DomainObjectMenu {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliased.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliased.java
index 11acc94369..8bb9ba6bea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliased.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliased.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
index 5a82c5cbe6..846b16d426 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.ObjectSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedSeeding.java
index 48a0227f38..2933c32406 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedJpa.java
index dbfe5d5bcb..5e5c14fe1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.aliased.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
index dc59a16d1c..29157951c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteRepository.java
index bd365a5d4a..774e3a5a27 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteRepository.java
@@ -28,6 +28,8 @@ import org.springframework.stereotype.Repository;
 
 import org.springframework.stereotype.Repository;
 
+import org.springframework.stereotype.Repository;
+
 import org.apache.causeway.applib.annotation.MinLength;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteSeeding.java
index c820729d8e..ca7be49c6b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompleteSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteJpa.java
index bb70bf86c0..f802352459 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jpa/DomainObjectAutoCompleteJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.autoComplete.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
index cd1db755d5..2c9c79c450 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingSeeding.java
index fa21024bf1..bb68c9a8d3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingJpa.java
index c19abc045a..df538e410b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.bounded.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
index 026b57ac72..bdb463bafd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
@@ -34,7 +34,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.DomainObjectEditingPage")
+@Named("demo.DomainObjectEditingVm")
 @DomainObject(
         editing = Editing.ENABLED)
 public class DomainObjectEditingPage implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingSeeding.java
index 0bb9c5d484..4921773252 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingJpa.java
index 8a70bc4e9b..3673c78f68 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.editing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
index d7d21e6199..4dfa516caa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingSeeding.java
index 0300f7790b..d6c3802f76 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
index bbd96419d4..82c481ac7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingJdo.java
index bec6d38a97..37916d13b4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing.jdo;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingJpa.java
index db51f73e59..cd19248b2d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.entityChangePublishing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
index 4f1e49b365..04a173bb77 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Introspection;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptSeeding.java
index 8dc3fd50c7..fb17246733 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/DomainObjectIntrospectionAnnotOptSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptJpa.java
index 7cfd601595..e85bc5f633 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdSeeding.java
index 32ceaa1992..875f18528a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/DomainObjectIntrospectionAnnotReqdSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdJpa.java
index 75fb57e629..2481db8a46 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedSeeding.java
index 1787ee048a..ffc8e77967 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/DomainObjectIntrospectionEncapsulatedSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedJpa.java
index d57b821161..a1895c055a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionVm_encapsulationEnabled.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionVm_encapsulationEnabled.java
index 13335ce112..4f0251a6a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionVm_encapsulationEnabled.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionVm_encapsulationEnabled.java
@@ -24,6 +24,8 @@ import jakarta.inject.Inject;
 
 import org.springframework.context.annotation.Profile;
 
+import org.springframework.context.annotation.Profile;
+
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
index 431ea8daf7..d8a303e828 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 
-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 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 org.apache.causeway.applib.annotation.ObjectSupport;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodSeeding.java
index 361ab7afe5..f480d2b9a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodJpa.java
index a745e57a08..aad9f6545c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.mixinMethod.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
index 546052b6f8..156a2a2040 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
index 7e809bcc91..80a4f90a71 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/DomainObjectNatureEntitySeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.entity;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureJpa.java
index d86986ed9b..60c6b70c3c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.entity.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
index 92fd44b73b..d212051d6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
@@ -18,15 +18,15 @@
  */
 package demoapp.dom.domain.objects.DomainObject.nature.viewmodel;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlTransient;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
index 661a269e23..37d7a9b54c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
index f02685c6a2..81fc8d0d64 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementWrapper;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.Collection;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
index 4c3899ac93..9698c4650d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
index ef04f56d1c..43fb1d3646 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
index c9ddb8053f..7f1ebcfa6d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.child;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
index fa989a3620..42ab7abb3e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEvent.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEvent.java
index 8c704ff50d..da2c0da85b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEvent.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEvent.java
@@ -33,6 +33,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
 import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.jpa.DomainObjectXxxLifecycleEventJpa;
 
+@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
 //tag::class[]
 @DomainObject(
         nature = Nature.ENTITY,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
index 594d3f9c1b..abb35c5d8e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-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 jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
index 2558285bd8..da9f7d5a87 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_clearEvents.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
index 3710d475d6..214b6105cf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
index f71ccfc073..f59d84851c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
index aca65d898d..6b174fbac5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
@@ -21,7 +21,7 @@ package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
 import java.util.LinkedList;
 import java.util.List;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa.java
index cee0f92734..b71d9cc6d5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
index 75afb7cf3d..233daafc49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/DomainObjectLayoutMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -43,7 +43,7 @@ import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayo
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 //@Log4j2
 public class DomainObjectLayoutMenu {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
index 84fa3841c1..86dccbf1e0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
 import org.apache.causeway.applib.annotation.DomainObject;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
index 5b46be93fa..4848a13aae 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-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 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 org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.BookmarkPolicy;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingSeeding.java
index 807f8e9385..2bb0e8b5e7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
index 8906ad392b..91979b3e63 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking;
 
 import java.util.stream.Collectors;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildJpa.java
index 7de961b695..2380336348 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildJpa.java
@@ -18,14 +18,14 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingJpa.java
index ff531ecf67..06d1a44b54 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingJpa.java
@@ -21,14 +21,14 @@ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.jpa;
 import java.util.Set;
 import java.util.TreeSet;
 
-import jakarta.inject.Named;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
index d9694a0e72..2f0b2e7663 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java
index 67d29d31d1..96ed094fe8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java
index d0ee550f49..670b639c55 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClass.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
index f47d7eacf5..187861ae8d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaSeeding.java
index f0c246077d..9886640d4e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa.java
index b3e27674f7..9388a6778e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
index 1b52e3d696..c19f5b9c93 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsSeeding.java
index ce6d50c1f0..2872b0a731 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa.java
index f53ec1eaeb..35b40ac3e7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.describedAs.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
index 05f1e035e4..5b10451075 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedSeeding.java
index cc22f986e6..c2c782c2a7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa.java
index 4f495e4548..55db14b5db 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.named.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
index 900acc9088..973deda233 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedSeeding.java
index 712097f951..31967eb900 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa.java
index 0b4566ff27..0f8d57bf98 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.paged.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
index dec080b8a3..e172336e62 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.DomainObjectLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
index 30bead8964..e6d494e4fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
@@ -2,7 +2,7 @@ package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
 import java.util.List;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.MemberSupport;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorSeeding.java
index 1f4a42d6e8..0109af4f7f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorJpa.java
index b33146e06f..f8cef376ce 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
index 00dd01fea0..45de7d38bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSeeding.java
index 28d1a9dd3e..e162076f53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
index d9cdeb5a4e..17bf59100d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventSubscriber.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventJpa.java
index 8370843824..22acdce760 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java
index 8457d225b4..8160ff87c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.domain.progmodel.objects.embedded.embedded;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -34,7 +34,7 @@ import lombok.RequiredArgsConstructor;
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class EmbeddedTypeMenu {
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java
index c53c19ea50..654c120042 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java
index b69b658e80..974fd582c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java
@@ -25,13 +25,14 @@ import java.util.regex.Pattern;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Value;
 
-import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber;
 import lombok.AccessLevel;
 import lombok.val;
 
+import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber;
+
 // tag::class[]
 //@Entity                                                               // <.>
-@jakarta.persistence.Embeddable                                         // <.>
+@javax.persistence.Embeddable                                           // <.>
 @Value                                                                  // <.>
 @lombok.Getter                                                          // <.>
 @lombok.Setter(AccessLevel.PRIVATE)                                     // <.>
@@ -40,10 +41,10 @@ import lombok.val;
 public class ComplexNumberJpa
         implements ComplexNumber {
 
-    @jakarta.persistence.Column(nullable = false)
+    @javax.persistence.Column(nullable = false)
     private double re;
 
-    @jakarta.persistence.Column(nullable = false)
+    @javax.persistence.Column(nullable = false)
     private double im;
 
 // end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java
index 2a173eacb8..8e52c9d03b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
@@ -33,12 +33,13 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
 
-import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber;
-import demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence.NumberConstantEntity;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber;
+import demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence.NumberConstantEntity;
+
 @Profile("demo-jpa")
 //tag::class[]
 @Entity
@@ -75,7 +76,7 @@ public class NumberConstantJpa
     @Getter @Setter
     private String name;
 
-    @jakarta.persistence.Embedded
+    @javax.persistence.Embedded
     @Property(editing = Editing.ENABLED)
     @Getter @Setter
     private ComplexNumberJpa number;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java
index 5f312ef146..af48e9e240 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java
index d95fea4a3a..7713845c91 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java
@@ -20,7 +20,7 @@
 
 package demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java
index b46c6c54ec..8ea74f96fd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.progmodel.objects.mixins.mixins;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -32,7 +32,7 @@ import lombok.val;
 @DomainService(
         nature = NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 public class MixinMenu {
 
     @Action
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java
index 7795091f6f..074900b948 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.progmodel.objects.mixins.mixins;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
index c7b38a2541..45b22a4e15 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
@@ -20,8 +20,8 @@ package demoapp.dom.domain.properties.Property;
 
 import java.util.function.Consumer;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -32,22 +32,23 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.applib.value.Clob;
 
-import demoapp.dom.domain.properties.Property.editing.PropertyEditingPage;
-
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingPage;
 import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventPage;
+import demoapp.dom.domain.properties.Property.editing.PropertyEditingPage;
+import demoapp.dom.domain.properties.Property.editingReasonDisabled.PropertyEditingReasonDisabledPage;
 import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingPage;
 import demoapp.dom.domain.properties.Property.fileAccept.PropertyFileAcceptPage;
+import demoapp.dom.domain.properties.Property.hidden.PropertyHiddenPage;
 import demoapp.dom.domain.properties.Property.maxLength.PropertyMaxLengthPage;
 import demoapp.dom.domain.properties.Property.mustSatisfy.PropertyMustSatisfyPage;
 import demoapp.dom.domain.properties.Property.optionality.PropertyOptionalityPage;
 import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingPage;
-import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildVm;
-import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
+import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
 import demoapp.dom.domain.properties.Property.regexPattern.PropertyRegexPatternPage;
 import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotPage;
 import demoapp.dom.types.Samples;
@@ -56,14 +57,13 @@ import demoapp.dom.types.Samples;
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class PropertyMenu {
 
     final ValueHolderRepository<String, ? extends PropertyProjectingChildEntity> propertyProjectingChildEntities;
     final Samples<Blob> blobSamples;
     final Samples<Clob> clobSamples;
-    final Samples<String> stringSamples;
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-terminal", describedAs = "Action invocation intentions as XML")
@@ -80,7 +80,23 @@ public class PropertyMenu {
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-pencil-alt", describedAs = "Editable fields")
     public PropertyEditingPage editing(){
-        return new PropertyEditingPage();
+        val vm = new PropertyEditingPage();
+
+        vm.setPropertyUsingAnnotation("this property is editable");
+        vm.setPropertyUsingMetaAnnotation("this property is also editable");
+        vm.setPropertyUsingMetaAnnotationButOverridden("this property is NOT editable");
+        return vm;
+    }
+
+    @Action(semantics = SemanticsOf.SAFE)
+    @ActionLayout(cssClassFa="fa-pencil-alt", describedAs = "Not editable fields")
+    public PropertyEditingReasonDisabledPage editingReasonDisabled(){
+        val vm = new PropertyEditingReasonDisabledPage();
+
+        vm.setPropertyUsingAnnotation("this property NOT is editable");
+        vm.setPropertyUsingMetaAnnotation("this property is also NOT editable");
+        vm.setPropertyUsingMetaAnnotationButOverridden("this property is NOT editable");
+        return vm;
     }
 
     @Action(semantics = SemanticsOf.SAFE)
@@ -92,17 +108,29 @@ public class PropertyMenu {
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-file-upload", describedAs = "Length of text fields")
     public PropertyFileAcceptPage fileAccept(){
-        val page = new PropertyFileAcceptPage();
-        setSampleBlob(".pdf", page::setPdfProperty);
-        setSampleClob(".txt", page::setTxtProperty);
-        return page;
+        val vm = new PropertyFileAcceptPage();
+
+        setSampleBlob(".pdf", vm::setPdfPropertyUsingAnnotation);
+        setSampleBlob(".pdf", vm::setPdfPropertyUsingMetaAnnotation);
+        setSampleBlob(".docx", vm::setDocxPropertyUsingMetaAnnotationButOverridden);
+        setSampleClob(".txt", vm::setTxtPropertyUsingAnnotation);
+
+        return vm;
+    }
+
+    @Action(semantics = SemanticsOf.SAFE)
+    @ActionLayout(cssClassFa="fa-glasses", describedAs = "Visibility of properties in different contexts")
+    public PropertyHiddenPage hidden() {
+        return new PropertyHiddenPage();
     }
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-ruler-horizontal", describedAs = "Length of text fields")
     public PropertyMaxLengthPage maxLength(){
         val vm = new PropertyMaxLengthPage();
-        vm.setName(stringSamples.single());
+        vm.setPropertyUsingAnnotation("abcdefghij");
+        vm.setPropertyUsingMetaAnnotation("abcdefghij");
+        vm.setPropertyUsingMetaAnnotationButOverridden("abc");
         return vm;
     }
 
@@ -110,7 +138,9 @@ public class PropertyMenu {
     @ActionLayout(cssClassFa="fa-star-half-alt", describedAs = "Regular expressions, such as email")
     public PropertyMustSatisfyPage mustSatisfy(){
         val vm = new PropertyMustSatisfyPage();
-        vm.setCustomerAge(18);
+        vm.setCustomerAgePropertyUsingAnnotation(18);
+        vm.setCustomerAgePropertyUsingMetaAnnotation(65);
+        vm.setCustomerAgePropertyUsingMetaAnnotationButOverridden(66);
         return vm;
     }
 
@@ -118,9 +148,10 @@ public class PropertyMenu {
     @ActionLayout(cssClassFa="fa-infinity", describedAs = "Regular expressions, such as email")
     public PropertyOptionalityPage optionality(){
         val vm = new PropertyOptionalityPage();
-        vm.setOptionalProperty(null);
-        vm.setMandatoryProperty("mandatory");
-        vm.setNullableProperty(null);
+        vm.setPropertyUsingAnnotation(null);
+        vm.setMandatoryPropertyUsingAnnotation("mandatory");
+        vm.setPropertyUsingMetaAnnotation(null);
+        vm.setPropertyUsingMetaAnnotationButOverridden("mandatory");
         return vm;
     }
 
@@ -140,15 +171,17 @@ public class PropertyMenu {
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-equals", describedAs = "Regular expressions, such as email")
     public PropertyRegexPatternPage regexPattern(){
-        val page = new PropertyRegexPatternPage();
-        page.setEmailAddress("joe@bloggs.com");
-        return page;
+        val vm = new PropertyRegexPatternPage();
+        vm.setEmailAddressPropertyUsingAnnotation("joe@bloggs.com");
+        vm.setEmailAddressPropertyUsingMetaAnnotation("flo@bloggs.com");
+        vm.setEmailAddressPropertyUsingMetaAnnotationButOverridden("mo@bloggs.org");
+        return vm;
     }
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-camera", describedAs = "Snapshot inclusion/exclusion")
     public PropertySnapshotPage snapshot(){
-        return new PropertySnapshotPage("Fred", "Bloggs", "K", "These are some notes");
+        return new PropertySnapshotPage("value");
     }
 
     private void setSampleBlob(final String suffix, final Consumer<Blob> blobConsumer) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
index b52c493394..25b86d35c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingSeeding.java
index 0170cee4fc..b9c6df228e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index 83390b2349..1c25f57412 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.commandPublishing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
index bf452d9784..c427f3cba6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventControlSubscriber.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
index a03cf0b548..f34e325730 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
index e3ee4afde2..ac0ea4bdc3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_changeControlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 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/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
index a3b2564448..b102c84c7b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage_controlStrategy.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.domainEvent;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.apache.causeway.applib.annotation.Property;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
index 252bbf0d2b..894329fe7f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
@@ -18,15 +18,22 @@
  */
 package demoapp.dom.domain.properties.Property.editing;
 
-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 javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+
+import lombok.Getter;
+import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
@@ -36,12 +43,55 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlAccessorType(XmlAccessType.FIELD)
 @Named("demo.PropertyEditingPage")
 @DomainObject(
-        editing = Editing.ENABLED)
+        nature=Nature.VIEW_MODEL,
+        editing = Editing.DISABLED              // <.>
+)
 public class PropertyEditingPage implements HasAsciiDocDescription {
+    // ...
+//end::class[]
 
     @ObjectSupport public String title() {
         return "@Property#editing";
     }
 
+//tag::annotation[]
+    @Property(
+        editing = Editing.ENABLED               // <.>
+    )
+    @PropertyLayout(
+        describedAs = "@Property(editing = ENABLED)",
+        fieldSetId = "annotation", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String propertyUsingAnnotation;
+//end::annotation[]
+
+//tag::meta-annotated[]
+    @Property()
+    @EditingEnabledMetaAnnotation               // <.>
+    @PropertyLayout(
+        describedAs = "@EditingEnabledMetaAnnotation",
+        fieldSetId = "meta-annotated", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String propertyUsingMetaAnnotation;
+//end::meta-annotated[]
+
+//tag::meta-annotated-overridden[]
+    @EditingEnabledMetaAnnotation               // <.>
+    @Property(
+        editing = Editing.DISABLED              // <.>
+    )
+    @PropertyLayout(
+        describedAs =
+            "@EditingEnabledMetaAnnotation " +
+            "@Property(editing = DISABLED)",
+            fieldSetId = "meta-annotated-overridden", sequence = "1")
+    @XmlElement(required = false)
+    @Getter @Setter
+    private String propertyUsingMetaAnnotationButOverridden;
+//end::meta-annotated-overridden[]
+
+//tag::class[]
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingSeeding.java
index 4ed02277e6..93a06a8417 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingSeeding.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.editing;
+package demoapp.dom.domain.properties.Property.hidden;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
@@ -26,13 +26,15 @@ import demoapp.dom._infra.seed.SeedServiceAbstract;
 import demoapp.dom._infra.values.ValueHolderRepository;
 
 @Service
-public class PropertyEditingSeeding
+public class PropertyHiddenSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public PropertyEditingSeeding(
-            ValueHolderRepository<String, ? extends PropertyEditing> entities) {
+    public PropertyHiddenSeeding(
+            ValueHolderRepository<String, ? extends PropertyHidden> entities) {
         super(entities);
     }
 
+
+
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingJpa.java
index 2d0a711047..244db1706e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingJpa.java
@@ -16,80 +16,75 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.editing.jpa;
+package demoapp.dom.domain.properties.Property.hidden.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.domain.properties.Property.editing.PropertyEditing;
+import demoapp.dom.domain.properties.Property.hidden.PropertyHidden;
 
 @Profile("demo-jpa")
 @Entity
 @Table(
     schema = "demo",
-    name = "PropertyEditingJpa"
+    name = "PropertyHiddenJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.PropertyEditing")
+@Named("demo.PropertyHiddenJpa")
 @NoArgsConstructor
 //tag::class[]
 // ...
 @DomainObject(nature = Nature.ENTITY)
-public class PropertyEditingJpa
-                extends PropertyEditing {
+public class PropertyHiddenJpa extends PropertyHidden {
     // ...
 //end::class[]
 
-    public PropertyEditingJpa(String value) {
+    public PropertyHiddenJpa(final String value) {
         setName(value);
-        setOriginalName(value);
+        setNameHiddenAllTables(value);
+        setNameHiddenEverywhere(value);
+        setNameHiddenObjectForms(value);
     }
 
     @Id
     @GeneratedValue
     private Long id;
-//tag::class[]
 
-//tag::name[]
-    @Property(
-            editing = Editing.ENABLED           // <.>
-    )
+    @Property()
     @Getter @Setter
     private String name;
-//end::name[]
 
-//tag::original-name[]
-    @Property(
-            editingDisabledReason =             // <.>
-                    "This property cannot be edited; " +
-                    "it stores the original value of the name"
-    )
+    @Property // TODO Property's hidden attribute will be removed in 2.0
+    @PropertyLayout(hidden = Where.ALL_TABLES)
     @Getter @Setter
-    private String originalName;
-//end::original-name[]
+    private String nameHiddenAllTables;
 
-//tag::initial-character[]
-    public Character getInitialCharacter() {    // <.>
-        return getName().charAt(0);
-    }
-//end::initial-character[]
-//end::class[]
+    @Property // TODO Property's hidden attribute will be removed in 2.0
+    @PropertyLayout(hidden = Where.EVERYWHERE)
+    @Getter @Setter
+    private String nameHiddenEverywhere;
+
+    @Property // TODO Property's hidden attribute will be removed in 2.0
+    @PropertyLayout(hidden = Where.OBJECT_FORMS)
+    @Getter @Setter
+    private String nameHiddenObjectForms;
 
 
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
new file mode 100644
index 0000000000..446ee8e0f0
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
@@ -0,0 +1,97 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package demoapp.dom.domain.properties.Property.editingReasonDisabled;
+
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
+//tag::class[]
+@XmlRootElement(name = "root")
+@XmlType
+@XmlAccessorType(XmlAccessType.FIELD)
+@Named("demo.PropertyEditingReasonDisabledPage")
+@DomainObject(
+        nature=Nature.VIEW_MODEL,
+        editing = Editing.DISABLED              // <.>
+)
+public class PropertyEditingReasonDisabledPage implements HasAsciiDocDescription {
+    // ...
+//end::class[]
+
+    @ObjectSupport public String title() {
+        return "@Property#editingReasonDisabled";
+    }
+
+//tag::annotation[]
+    @Property(
+            editing = Editing.DISABLED,
+            editingDisabledReason = "disabled for demo purposes") // <.>
+    @PropertyLayout(
+        describedAs = "@Property(editingDisabledReason = \"disabled for demo purposes\")",
+        fieldSetId = "annotation", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String propertyUsingAnnotation;
+//end::annotation[]
+
+//tag::meta-annotated[]
+    @Property()
+    @EditingReasonDisabledMetaAnnotation                            // <.>
+    @PropertyLayout(
+        describedAs = "@EditingReasonDisabledMetaAnnotation",
+        fieldSetId = "meta-annotated", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String propertyUsingMetaAnnotation;
+//end::meta-annotated[]
+
+//tag::meta-annotated-overridden[]
+    @EditingReasonDisabledMetaAnnotation                            // <.>
+    @Property(
+            editing = Editing.DISABLED,
+            editingDisabledReason = "disabled for demo purposes") // <.>
+    @PropertyLayout(
+        describedAs =
+            "@EditingReasonDisabledMetaAnnotation " +
+            "@Property(editingDisabledReason = \"disabled for demo purposes\")",
+            fieldSetId = "meta-annotated-overridden", sequence = "1")
+    @XmlElement(required = false)
+    @Getter @Setter
+    private String propertyUsingMetaAnnotationButOverridden;
+//end::meta-annotated-overridden[]
+
+//tag::class[]
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
index 2e71ff9f0d..99e9414d15 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingSeeding.java
index fb71cda073..f4970f4ca7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index b31cae4461..e2e5adad65 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.executionPublishing.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage_objects.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage_objects.java
new file mode 100644
index 0000000000..5d207174b2
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage_objects.java
@@ -0,0 +1,28 @@
+package demoapp.dom.domain.properties.Property.hidden;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.MemberSupport;
+
+import lombok.RequiredArgsConstructor;
+
+import demoapp.dom._infra.values.ValueHolderRepository;
+
+//tag::class[]
+@Collection()
+@RequiredArgsConstructor
+public class PropertyHiddenPage_objects {
+
+    @SuppressWarnings("unused")
+    private final PropertyHiddenPage page;
+
+    @MemberSupport public List<? extends PropertyHidden> coll() {
+        return objectRepository.all();
+    }
+
+    @Inject ValueHolderRepository<String, ? extends PropertyHidden> objectRepository;
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/jpa/PropertyHiddenJpaEntities.java
similarity index 55%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/jpa/PropertyHiddenJpaEntities.java
index 9a89175507..f6cde70b51 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/jpa/PropertyHiddenJpaEntities.java
@@ -16,25 +16,40 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.snapshot.jpa;
+package demoapp.dom.domain.properties.Property.hidden.jpa;
+
+import java.util.List;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.properties.Property.hidden.PropertyHidden;
+import demoapp.dom.domain.properties.Property.hidden.PropertyHiddenRepository;
 
 @Profile("demo-jpa")
 @Service
-public class PropertySnapshotJpaEntities
-extends ValueHolderRepository<String, PropertySnapshotJpa> {
+public class PropertyHiddenJpaEntities
+extends ValueHolderRepository<String, PropertyHiddenJpa> implements PropertyHiddenRepository {
+
+    protected PropertyHiddenJpaEntities() {
+        super(PropertyHiddenJpa.class);
+    }
 
-    protected PropertySnapshotJpaEntities() {
-        super(PropertySnapshotJpa.class);
+    @Override
+    protected PropertyHiddenJpa newDetachedEntity(String value) {
+        return new PropertyHiddenJpa(value);
     }
 
     @Override
-    protected PropertySnapshotJpa newDetachedEntity(String value) {
-        return new PropertySnapshotJpa(value);
+    public List<? extends PropertyHidden> allInstances() {
+        return all();
     }
 
+    public List<? extends PropertyHidden> allMatches(final String s) {
+        return all();
+    }
+    public List<? extends PropertyHidden> allMatches() {
+        return all();
+    }
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
index cb22149f42..927de5ac77 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
@@ -32,10 +32,11 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Optionality;
 import org.apache.causeway.applib.annotation.Property;
 
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import lombok.Getter;
 import lombok.Setter;
 
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
index 9f0edc087e..113225ad3f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.projecting;
+package demoapp.dom.domain.properties.Property.projecting.child;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
@@ -41,16 +41,18 @@ import lombok.Setter;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdo;
 import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpa;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
 
 //tag::class[]
 @XmlRootElement(name = "child")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
 @Named("demo.PropertyProjectingChildVm")
-@DomainObject(nature=Nature.VIEW_MODEL)
+@DomainObject(
+        nature=Nature.VIEW_MODEL)
 @NoArgsConstructor
 public class PropertyProjectingChildVm implements HasAsciiDocDescription {
-    // ...
+
 //end::class[]
     public PropertyProjectingChildVm(final PropertyProjectingChildEntity backingEntity) {
         setBackingEntity(backingEntity);
@@ -68,9 +70,31 @@ public class PropertyProjectingChildVm implements HasAsciiDocDescription {
         projecting = Projecting.PROJECTED       // <.>
     )
     @PropertyLayout(hidden = Where.EVERYWHERE)  // <.>
-    @XmlElement(required = true)
-    @Getter @Setter
-    private PropertyProjectingChildEntity backingEntity;
+    public PropertyProjectingChildEntity getBackingEntity() {
+        return backingEntityJpa!=null
+                ? backingEntityJpa
+                : backingEntityJdo;
+    }
+    public void setBackingEntity(final PropertyProjectingChildEntity backingEntity) {
+        this.backingEntityJpa = backingEntity instanceof PropertyProjectingChildJpa
+                ? (PropertyProjectingChildJpa) backingEntity
+                : null;
+        this.backingEntityJdo = backingEntity instanceof PropertyProjectingChildJdo
+                ? (PropertyProjectingChildJdo) backingEntity
+                : null;
+    }
 //end::projecting[]
+//end::class[]
+    @Programmatic
+    @XmlElement(required = false)
+    @Getter @Setter
+    private PropertyProjectingChildJpa backingEntityJpa;
+
+    @Programmatic
+    @XmlElement(required = false)
+    @Getter @Setter
+    private PropertyProjectingChildJdo backingEntityJdo;
+//tag::class[]
+    // ..
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
index d2a7664029..1a8f72e856 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
@@ -21,13 +21,13 @@ package demoapp.dom.domain.properties.Property.projecting;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementWrapper;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
 import org.apache.causeway.applib.annotation.DomainObject;
@@ -41,6 +41,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage_returnsChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage_returnsChildren.java
index 579d3938e8..1d15b3ec20 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage_returnsChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage_returnsChildren.java
@@ -25,6 +25,8 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 
 import lombok.RequiredArgsConstructor;
 
+import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectingChildVm;
+
 @Action(
     semantics = SemanticsOf.SAFE
 )
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
index 46b678d0af..f58301f48f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
@@ -18,12 +18,12 @@
  */
 package demoapp.dom.domain.properties.Property.projecting.jdo;
 
-import jakarta.inject.Named;
+import javax.inject.Named;
 import javax.jdo.annotations.DatastoreIdentity;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.PersistenceCapable;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
@@ -37,7 +37,7 @@ import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
index ea8440e2da..856a848a2a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
@@ -18,13 +18,13 @@
  */
 package demoapp.dom.domain.properties.Property.projecting.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import org.springframework.context.annotation.Profile;
 
@@ -39,7 +39,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
+import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyProjectingChildEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
index 5d8ec0d31e..e5384e03d3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
@@ -18,18 +18,19 @@
  */
 package demoapp.dom.domain.properties.Property.snapshot;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Snapshot;
 
 import lombok.Getter;
@@ -38,64 +39,97 @@ import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
-@Named("demo.PropertySnapshotPage")
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
+@Named("demo.PropertySnapshotVm")
 @DomainObject(
     nature=Nature.VIEW_MODEL,
     editing = Editing.ENABLED)
 @NoArgsConstructor
 public class PropertySnapshotPage implements HasAsciiDocDescription {
 
-    public PropertySnapshotPage(
-            final String givenName,
-            final String familyName,
-            final String middleInitial,
-            final String notes) {
-        this.familyName = familyName;
-        this.givenName = givenName;
-        this.middleInitial = middleInitial;
-        this.notes = notes;
+    public PropertySnapshotPage(final String text) {
+        this.text = text;
+        this.excludedProperty = text;
+        this.includedProperty = text;
+        this.notSpecifiedProperty = text;
+        this.metaAnnotatedProperty = text;
+        this.metaAnnotatedPropertyOverridden = text;
     }
 
     @ObjectSupport public String title() {
-        return "PropertySnapshotPage";
+        return "PropertySnapshotVm";
     }
 
+//tag::no-annotation[]
+    @Property()
+    @PropertyLayout(fieldSetId = "no-annotations", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String text;
+//end::no-annotation[]
+
 //tag::annotated-not_specified[]
     @Property(
-        snapshot = Snapshot.NOT_SPECIFIED   // <.>
+        snapshot = Snapshot.NOT_SPECIFIED
     )
+    @PropertyLayout(
+        describedAs = "@Property(snapshot = NOT_SPECIFIED)",
+        fieldSetId = "annotations", sequence = "1")
     @XmlElement(required = true)
     @Getter @Setter
-    private String givenName;
+    private String notSpecifiedProperty;
 //end::annotated-not_specified[]
 
-//tag::annotated-included[]
+//tag::annotated-excluded[]
     @Property(
-        snapshot = Snapshot.INCLUDED        // <.>
+        snapshot = Snapshot.EXCLUDED
     )
+    @PropertyLayout(
+        describedAs = "@Property(snapshot = EXCLUDED)",
+        fieldSetId = "annotations", sequence = "2")
     @XmlElement(required = true)
     @Getter @Setter
-    private String familyName;
-//end::annotated-included[]
+    private String excludedProperty;
+//end::annotated-excluded[]
 
-//tag::annotated-excluded[]
+//tag::annotated-included[]
     @Property(
-        snapshot = Snapshot.EXCLUDED        // <.>
+        snapshot = Snapshot.INCLUDED
     )
+    @PropertyLayout(
+        describedAs = "@Property(snapshot = INCLUDED)",
+        fieldSetId = "annotations", sequence = "2")
     @XmlElement(required = true)
     @Getter @Setter
-    private String middleInitial;
-//end::annotated-excluded[]
+    private String includedProperty;
+//end::annotated-included[]
 
-//tag::no-annotation[]
-    @Property()                             // <.>
+//tag::meta-annotated-excluded[]
+    @SnapshotExcludedMetaAnnotation
+    @Property()
+    @PropertyLayout(
+        describedAs = "@SnapshotExcludedMetaAnnotation ",
+        fieldSetId = "meta-annotations", sequence = "1")
     @XmlElement(required = true)
     @Getter @Setter
-    private String notes;
-//end::no-annotation[]
+    private String metaAnnotatedProperty;
+//end::meta-annotated-excluded[]
 
+//tag::meta-annotated-included[]
+    @SnapshotIncludedMetaAnnotation
+    @Property(
+        snapshot = Snapshot.EXCLUDED
+    )
+    @PropertyLayout(
+        describedAs =
+            "@SnapshotIncludedMetaAnnotation "
+            + "@Property(snapshot = EXCLUDED)",
+        fieldSetId = "meta-annotations-overridden", sequence = "1")
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String metaAnnotatedPropertyOverridden;
+//end::meta-annotated-included[]
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotSeeding.java
index 92034a9e2a..f8dbd42a54 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotSeeding.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.snapshot;
+package demoapp.dom.domain.actions.Action.hidden;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
@@ -26,12 +26,12 @@ import demoapp.dom._infra.seed.SeedServiceAbstract;
 import demoapp.dom._infra.values.ValueHolderRepository;
 
 @Service
-public class PropertySnapshotSeeding
+public class ActionHiddenSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public PropertySnapshotSeeding(
-            ValueHolderRepository<String, ? extends PropertySnapshot> entities) {
+    public ActionHiddenSeeding(
+            ValueHolderRepository<String, ? extends ActionHidden> entities) {
         super(entities);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpa.java
index 22d88e2f61..52c76392fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpa.java
@@ -16,61 +16,53 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.snapshot.jpa;
+package demoapp.dom.domain.actions.Action.hidden.jpa;
 
-import jakarta.inject.Named;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import javax.inject.Named;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.springframework.context.annotation.Profile;
 
 import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshot;
+import demoapp.dom.domain.actions.Action.hidden.ActionHidden;
 
 @Profile("demo-jpa")
 @Entity
 @Table(
     schema = "demo",
-    name = "PropertySnapshotJpa"
+    name = "ActionHiddenJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.PropertySnapshot")
+@Named("demo.ActionHiddenJpa")
 @NoArgsConstructor
 //tag::class[]
 // ...
 @DomainObject(nature = Nature.ENTITY)
-public class PropertySnapshotJpa
-                extends PropertySnapshot {
+public class ActionHiddenJpa extends ActionHidden {
     // ...
 //end::class[]
 
-    public PropertySnapshotJpa(String value) {
+    public ActionHiddenJpa(String value) {
         setName(value);
     }
 
     @Id
     @GeneratedValue
     private Long id;
-//tag::class[]
 
-//tag::name[]
-    @Property()
     @Getter @Setter
     private String name;
-//end::name[]
-
 
 //tag::class[]
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java
index 9a89175507..fe5725bcfd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotJpaEntities.java
@@ -16,25 +16,40 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.snapshot.jpa;
+package demoapp.dom.domain.actions.Action.hidden.jpa;
+
+import java.util.List;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.actions.Action.hidden.ActionHidden;
+import demoapp.dom.domain.actions.Action.hidden.ActionHiddenRepository;
 
 @Profile("demo-jpa")
 @Service
-public class PropertySnapshotJpaEntities
-extends ValueHolderRepository<String, PropertySnapshotJpa> {
+public class ActionHiddenJpaEntities
+extends ValueHolderRepository<String, ActionHiddenJpa> implements ActionHiddenRepository {
+
+    protected ActionHiddenJpaEntities() {
+        super(ActionHiddenJpa.class);
+    }
 
-    protected PropertySnapshotJpaEntities() {
-        super(PropertySnapshotJpa.class);
+    @Override
+    protected ActionHiddenJpa newDetachedEntity(String value) {
+        return new ActionHiddenJpa(value);
     }
 
     @Override
-    protected PropertySnapshotJpa newDetachedEntity(String value) {
-        return new PropertySnapshotJpa(value);
+    public List<? extends ActionHidden> allInstances() {
+        return all();
     }
 
+    public List<? extends ActionHidden> allMatches(final String s) {
+        return all();
+    }
+    public List<? extends ActionHidden> allMatches() {
+        return all();
+    }
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
index eb0e65e02c..a4743d3255 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java
@@ -30,6 +30,9 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
 
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
 import demoapp.dom.domain.properties.PropertyLayout.cssClass.PropertyLayoutCssClassPage;
 import demoapp.dom.domain.properties.PropertyLayout.describedAs.PropertyLayoutDescribedAsPage;
 import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHiddenPage;
@@ -40,8 +43,6 @@ import demoapp.dom.domain.properties.PropertyLayout.navigable.FileNodeVm;
 import demoapp.dom.domain.properties.PropertyLayout.repainting.PropertyLayoutRepaintingPage;
 import demoapp.dom.domain.properties.PropertyLayout.typicalLength.PropertyLayoutTypicalLengthPage;
 import demoapp.dom.types.Samples;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
 
 @Named("demo.PropertyLayoutMenu")
 @DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
index ee86ca804f..f2da7524ef 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
@@ -18,11 +18,11 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden;
 
-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 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 org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
index 02c958b82f..8bde7f5ec0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenSeeding.java
@@ -18,7 +18,7 @@
  */
 package demoapp.dom.domain.properties.PropertyLayout.hidden;
 
-import jakarta.inject.Inject;
+import javax.inject.Inject;
 
 import org.springframework.stereotype.Service;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
index 73dc56f304..14c1801511 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
@@ -20,9 +20,9 @@ package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
 import java.io.File;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlRootElement;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.LabelPosition;
@@ -42,8 +42,8 @@ import lombok.val;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 
-@Named("demo.FileNodeVm")
-@XmlRootElement(name="FileNodeVm")
+@XmlRootElement(name="FileNode")
+@Named("demo.FileNode")
 @DomainObject(nature=Nature.VIEW_MODEL)
 @ToString
 @NoArgsConstructor
@@ -74,12 +74,17 @@ public class FileNodeVm implements HasAsciiDocDescription {
     }
 //end::iconName[]
 
+//tag::tree[]
+    @Property
+    @PropertyLayout(labelPosition = LabelPosition.NONE, fieldSetId = "tree", sequence = "1")
+    public TreeNode<FileNodeVm> getTree() {
+        return fileTreeNodeService.sessionTree();
+    }
+//end::tree[]
+
 //tag::navigable[]
     @Property
-    @PropertyLayout(
-            navigable=Navigable.PARENT,             // <.>
-            hidden=Where.EVERYWHERE                 // <.>
-    )
+    @PropertyLayout(navigable=Navigable.PARENT, hidden=Where.EVERYWHERE, fieldSetId = "detail", sequence = "1")
     public FileNodeVm getParent() {
         val parentFile = asFile().getParentFile();
         return parentFile != null
@@ -103,4 +108,6 @@ public class FileNodeVm implements HasAsciiDocDescription {
         return new File(path);
     }
 
+    @Inject
+    FileTreeNodeService fileTreeNodeService;
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
new file mode 100644
index 0000000000..c5c4a806c4
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
@@ -0,0 +1,141 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package demoapp.dom.domain.properties.PropertyLayout.renderDay;
+
+import java.time.LocalDate;
+
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Editing;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.Optionality;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.ValueSemantics;
+import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
+//tag::class[]
+@XmlRootElement(name = "root")
+@XmlType
+@XmlAccessorType(XmlAccessType.FIELD)
+@Named("demo.PropertyLayoutRenderDayVm")
+@DomainObject(
+        nature=Nature.VIEW_MODEL,
+        editing = Editing.ENABLED)
+@NoArgsConstructor
+public class PropertyLayoutRenderDayPage implements HasAsciiDocDescription {
+
+    public PropertyLayoutRenderDayPage(final LocalDate localDate) {
+        startDate = localDate;
+        endDate = startDate.plusDays(7);
+    }
+
+    @ObjectSupport public String title() {
+        return "@PropertyLayout#renderDay";
+    }
+
+//tag::render-not-specified[]
+    @Property(optionality = Optionality.OPTIONAL)
+    @ValueSemantics                                 // <.>
+    @PropertyLayout(describedAs = "@ValueSemantics",
+        fieldSetId = "annotation", sequence = "1")
+    @XmlElement(required = false)
+    @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+    @Getter @Setter
+    private LocalDate startDate;
+//end::render-not-specified[]
+
+//tag::render-as-day-before[]
+    @Property(optionality = Optionality.OPTIONAL)
+    @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)                    // <.>
+    @PropertyLayout(describedAs =
+            "@ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)",
+        fieldSetId = "annotation", sequence = "2")
+    @XmlElement(required = false)
+    @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+    @Getter @Setter
+    private LocalDate endDate;
+//end::render-as-day-before[]
+
+//tag::render-as-day[]
+    @Property(optionality = Optionality.OPTIONAL)
+    @ValueSemantics(dateRenderAdjustDays = 0)                     // <.>
+    @PropertyLayout(describedAs =
+            "Value of getEndDate(), but @ValueSemantics(dateRenderAdjustDays = 0)",
+        fieldSetId = "annotation", sequence = "3")
+    public LocalDate getEndDateRaw() {
+        return getEndDate();
+    }
+//end::render-as-day[]
+
+//tag::layout-file[]
+    @Property(optionality = Optionality.OPTIONAL)
+    @PropertyLayout(                                // <.>
+        describedAs =
+            "<cpt:property id=\"endDateLayoutFile\" " +
+            "renderedAsDayBefore=\"true\"/>",
+        fieldSetId = "layout-file", sequence = "1")
+    @XmlElement(required = false)
+    @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+    @Getter @Setter
+    private LocalDate endDateUsingLayout;
+//end::layout-file[]
+
+//tag::meta-annotation[]
+    @RenderDayMetaAnnotationEndDateExclusive        // <.>
+    @Property(optionality = Optionality.OPTIONAL)
+    @PropertyLayout(
+        describedAs =
+            "@RenderDayMetaAnnotationEndDateExclusive",
+        fieldSetId = "meta-annotated", sequence = "1")
+    @XmlElement(required = false)
+    @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+    @Getter @Setter
+    private LocalDate endDateUsingMetaAnnotation;
+//end::meta-annotation[]
+
+//tag::meta-annotation-overridden[]
+    @RenderDayMetaAnnotationStartDateInclusive      // <.>
+    @Property(optionality = Optionality.OPTIONAL)
+    @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
+    @PropertyLayout(describedAs =
+            "@RenderDayMetaAnnotationEndDateExclusive",
+        fieldSetId = "meta-annotated-overridden", sequence = "1")
+    @XmlElement(required = false)
+    @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+    @Getter @Setter
+    private LocalDate endDateUsingMetaAnnotationButOverridden;
+//end::meta-annotation-overridden[]
+
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
index dd4b18797b..fc0243600c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.services.core;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,12 +37,14 @@ import demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemo
 import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm;
 import demoapp.dom.services.core.messageservice.MessageServiceDemoVm;
 import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
+import demoapp.dom.services.core.xmlSnapshotService.XmlSnapshotParentVm;
+import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
 
 @Named("demo.ServicesMenu")
 @DomainService(
         nature=NatureOfService.VIEW
 )
-@jakarta.annotation.Priority(PriorityPrecedence.EARLY)
+@javax.annotation.Priority(PriorityPrecedence.EARLY)
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
 public class ServicesMenu {
 
@@ -74,4 +76,24 @@ public class ServicesMenu {
         return wrapperFactoryEntities.first().orElse(null);
     }
 
+    @Action(semantics = SemanticsOf.SAFE)
+    @ActionLayout(cssClassFa="fa-camera", describedAs = "Snapshot object graphs as XML")
+    public XmlSnapshotParentVm xmlSnapshot(){
+
+        val parentVm = new XmlSnapshotParentVm("parent object");
+
+        parentVm.addChild("child 1");
+        parentVm.addChild("child 2");
+        parentVm.addChild("child 3");
+
+        final XmlSnapshotPeerVm peerVm = new XmlSnapshotPeerVm("peer object");
+        parentVm.setPeer(peerVm);
+
+        peerVm.addChild("child 1");
+        peerVm.addChild("child 2");
+        peerVm.addChild("child 3");
+
+        return parentVm;
+    }
+
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
index 021f7ae47e..186fb0e1dd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
@@ -18,8 +18,8 @@
  */
 package demoapp.dom.services.core.eventbusservice;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Scope;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
similarity index 52%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
copy to examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
index d2a7664029..2ac4af2a4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
@@ -16,61 +16,74 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.properties.Property.projecting;
+package demoapp.dom.services.core.xmlSnapshotService;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElementWrapper;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Editing;
 import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
+import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.val;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.services.core.xmlSnapshotService.child.XmlSnapshotChildVm;
+import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
 
-//tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.PropertyProjectingVm")
+@Named("demo.XmlSnapshotParentVm")
 @DomainObject(
-        nature=Nature.VIEW_MODEL,
-        editing = Editing.ENABLED)
+    nature=Nature.VIEW_MODEL)
 @NoArgsConstructor
-public class PropertyProjectingPage implements HasAsciiDocDescription {
+public class XmlSnapshotParentVm implements HasAsciiDocDescription {
+
+    public XmlSnapshotParentVm(final String text) {
+        this.text = text;
+    }
 
     @ObjectSupport public String title() {
-        return "@Property#projecting";
+        return "XmlSnapshotService parent VM";
     }
 
-//tag::property[]
+    @Property(editing = Editing.ENABLED)
     @PropertyLayout(fieldSetId = "properties", sequence = "1")
-    public PropertyProjectingChildVm getFirstChild() {
-        return getChildren().get(0);
-    }
-//end::property[]
+    @XmlElement(required = true)
+    @Getter @Setter
+    private String text;
 
-//tag::children[]
-    @Collection
-    @XmlElementWrapper(name = "children")
-    @XmlElement(name = "child")
+    @Property(editing = Editing.DISABLED)
+    @PropertyLayout(fieldSetId = "properties", sequence = "3")
+    @XmlElement(required = false)
     @Getter @Setter
-    private List<PropertyProjectingChildVm> children = new ArrayList<>();
-//end::children[]
+    private XmlSnapshotPeerVm peer;
+
+    @Collection()
+    @CollectionLayout()
+    @Getter
+    private List<XmlSnapshotChildVm> children = new ArrayList<>();
+
+    public XmlSnapshotParentVm addChild(final String value) {
+        val childVm = new XmlSnapshotChildVm(value);
+        getChildren().add(childVm);
+        return this;
+    }
 
 }
-//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/class-diagram.svg b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/class-diagram.svg
new file mode 100644
index 0000000000..81d09562fd
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/class-diagram.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" contentScriptType="application/ecmascript" contentStyleType="text/css"
+     height="204px" preserveAspectRatio="none" style="width:395px;height:204px;" version="1.1" viewBox="0 0 395 204"
+     width="395px" zoomAndPan="magnify"><defs><filter height="300%" id="f7fnutsw389h2" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[32d581083680e78d9d4319b879b2ba2a]
+class XmlSnapshotParentVm--><rect codeLine="3" fill="#FEFECE" filter="url(#f7fnutsw389h2)" height="53.1999" id="XmlSnapshotParentVm" style="stroke:#A80036;stroke-width:1.5;" width="154" x="7" y="7"/><ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M21.3594,26.7813 Q22.1563,26.7813 22.7188,26.5938 Q23.2969,26.3906 23.5313,26.1719 Q23.7813,25.9375 24.0156,25.75 Q24.2656,25.5469 24.4844,25.5469 Q24.8281,25.5469 25.0781,25.8125 Q25.34 [...]
+class XmlSnapshotChildVm--><rect codeLine="6" fill="#FEFECE" filter="url(#f7fnutsw389h2)" height="53.1999" id="XmlSnapshotChildVm" style="stroke:#A80036;stroke-width:1.5;" width="148" x="10" y="137"/><ellipse cx="25" cy="153" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M24.3594,156.7813 Q25.1563,156.7813 25.7188,156.5938 Q26.2969,156.3906 26.5313,156.1719 Q26.7813,155.9375 27.0156,155.75 Q27.2656,155.5469 27.4844,155.5469 Q27.8281,155.5469 28.0781,15 [...]
+class XmlSnapshotPeerVm--><rect codeLine="9" fill="#FEFECE" filter="url(#f7fnutsw389h2)" height="53.1999" id="XmlSnapshotPeerVm" style="stroke:#A80036;stroke-width:1.5;" width="144" x="223" y="7"/><ellipse cx="238" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M237.3594,26.7813 Q238.1563,26.7813 238.7188,26.5938 Q239.2969,26.3906 239.5313,26.1719 Q239.7813,25.9375 240.0156,25.75 Q240.2656,25.5469 240.4844,25.5469 Q240.8281,25.5469 241.0781,25.8 [...]
+class XmlSnapshotPeerChildVm--><rect codeLine="12" fill="#FEFECE" filter="url(#f7fnutsw389h2)" height="53.1999" id="XmlSnapshotPeerChildVm" style="stroke:#A80036;stroke-width:1.5;" width="172" x="209" y="137"/><ellipse cx="224" cy="153" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M223.3594,156.7813 Q224.1563,156.7813 224.7188,156.5938 Q225.2969,156.3906 225.5313,156.1719 Q225.7813,155.9375 226.0156,155.75 Q226.2656,155.5469 226.4844,155.5469 Q226.828 [...]
+link XmlSnapshotParentVm to XmlSnapshotPeerVm--><path codeLine="16" d="M161.07,33.5 C179.47,33.5 199.12,33.5 217.54,33.5 " fill="none" id="XmlSnapshotParentVm-to-XmlSnapshotPeerVm" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="222.7,33.5,213.7,29.5,217.7,33.5,213.7,37.5,222.7,33.5" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="25" x="179.5" y="27.5">peer</text><!--MD5=[ [...]
+link XmlSnapshotParentVm to XmlSnapshotChildVm--><path codeLine="17" d="M84,60.1 C84,80.76 84,109.91 84,131.83 " fill="none" id="XmlSnapshotParentVm-to-XmlSnapshotChildVm" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="84,136.95,88,127.95,84,131.95,80,127.95,84,136.95" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="88" y="104">children</text><text fill="#000000" fo [...]
+link XmlSnapshotPeerVm to XmlSnapshotPeerChildVm--><path codeLine="18" d="M295,60.1 C295,80.76 295,109.91 295,131.83 " fill="none" id="XmlSnapshotPeerVm-to-XmlSnapshotPeerChildVm" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="295,136.95,299,127.95,295,131.95,291,127.95,295,136.95" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="45" x="299" y="104">children</text><text fil [...]
+@startuml
+hide empty members
+
+class XmlSnapshotParentVm {
+    text: String
+}
+class XmlSnapshotChildVm {
+    value: String
+}
+class XmlSnapshotPeerVm {
+    value: String
+}
+class XmlSnapshotPeerChildVm {
+    value: String
+}
+
+XmlSnapshotParentVm -r->  XmlSnapshotPeerVm : peer
+XmlSnapshotParentVm -d-> "0..*" XmlSnapshotChildVm : " children"
+XmlSnapshotPeerVm -d-> "0..*" XmlSnapshotPeerChildVm : " children"
+@enduml
+
+PlantUML version 1.2021.00(Sun Jan 10 10:25:05 GMT 2021)
+(GPL source distribution)
+Java Runtime: OpenJDK Runtime Environment
+JVM: OpenJDK 64-Bit Server VM
+Default Encoding: UTF-8
+Language: en
+Country: US
+--></g></svg>
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
similarity index 55%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
copy to examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
index b03e7a9bfa..131cf3526f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
@@ -16,51 +16,65 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.actions.ActionLayout.associateWith.child;
+package demoapp.dom.services.core.xmlSnapshotService.peer;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+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.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.CollectionLayout;
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Title;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.val;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.services.core.xmlSnapshotService.peer.child.XmlSnapshotPeerChildVm;
 
 //tag::class[]
-@XmlRootElement(name = "child")
+@XmlRootElement(name = "peer")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.ActionLayoutAssociateWithChildVm")
-@DomainObject(nature=Nature.VIEW_MODEL)
+@Named("demo.XmlSnapshotPeerVm")
+@DomainObject(
+        nature=Nature.VIEW_MODEL)
 @NoArgsConstructor
-public class ActionLayoutAssociateWithChildVm implements HasAsciiDocDescription {
+public class XmlSnapshotPeerVm implements HasAsciiDocDescription {
 
-    public ActionLayoutAssociateWithChildVm(final String value) {
+    public XmlSnapshotPeerVm(final String value) {
         setValue(value);
     }
 
-    @ObjectSupport public String title() {
-        return getValue();
-    }
-
+    @Title
     @Property()
     @PropertyLayout(fieldSetId = "annotation", sequence = "1")
     @XmlElement(required = false)
     @Getter @Setter
     private String value;
 
+    @Collection()
+    @CollectionLayout()
+    @Getter
+    private List<XmlSnapshotPeerChildVm> children = new ArrayList<>();
 
+    public XmlSnapshotPeerVm addChild(final String value) {
+        val childVm = new XmlSnapshotPeerChildVm(value);
+        getChildren().add(childVm);
+        return this;
+    }
 
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
similarity index 68%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
copy to examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
index 4a2b4793c5..14164e908c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
@@ -16,20 +16,20 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.domain.actions.ActionLayout.describedAs.child;
+package demoapp.dom.services.core.xmlSnapshotService.peer.child;
 
-import jakarta.inject.Named;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.inject.Named;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 import org.apache.causeway.applib.annotation.DomainObject;
 import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.ObjectSupport;
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Title;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -41,26 +41,22 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 @XmlRootElement(name = "child")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.ActionLayoutDescribedAsChildVm")
-@DomainObject(nature=Nature.VIEW_MODEL)
+@Named("demo.XmlSnapshotPeerChildVm")
+@DomainObject(
+        nature=Nature.VIEW_MODEL)
 @NoArgsConstructor
-public class ActionLayoutDescribedAsChildVm implements HasAsciiDocDescription {
+public class XmlSnapshotPeerChildVm implements HasAsciiDocDescription {
 
-    public ActionLayoutDescribedAsChildVm(final String value) {
+    public XmlSnapshotPeerChildVm(final String value) {
         setValue(value);
     }
 
-    @ObjectSupport public String title() {
-        return getValue();
-    }
-
+    @Title
     @Property()
     @PropertyLayout(fieldSetId = "annotation", sequence = "1")
     @XmlElement(required = false)
     @Getter @Setter
     private String value;
 
-
-
 }
 //end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeType.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeType.java
index 884e2be8d2..b81e348dd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeType.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeType.java
@@ -16,20 +16,38 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.causeway.treenode;
+package demoapp.dom.domain.properties.Property.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 org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.ObjectSupport;
-import org.apache.causeway.applib.util.Enums;
 
-//tag::class[]
-public enum FileNodeType {
+import lombok.NoArgsConstructor;
 
-    FILE_SYSTEM_ROOT,
-    DIRECTORY,
-    FILE;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
+@XmlRootElement(name = "root")
+@XmlType
+@XmlAccessorType(XmlAccessType.FIELD)
+@Named("demo.PropertyHiddenPage")
+@DomainObject(
+    nature=Nature.VIEW_MODEL)
+@NoArgsConstructor
+//tag::class[]
+public class PropertyHiddenPage implements HasAsciiDocDescription {
+    // ...
+//end::class[]
 
     @ObjectSupport public String title() {
-        return Enums.getFriendlyNameOf(this);   // <.>
+        return "@Property#hidden";
     }
+
+//tag::class[]
 }
 //end::class[]
diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
index 9092605d89..5b8650c817 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestCommon.java
@@ -34,11 +34,12 @@ import org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi
 import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
 import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer;
 
-import demoapp.dom._infra.fixtures.DemoFixtureScript;
-import demoapp.web.security.PrototypeActionsVisibilityAdvisor;
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
 
+import demoapp.dom._infra.fixtures.DemoFixtureScript;
+import demoapp.web.security.PrototypeActionsVisibilityAdvisor;
+
 /**
  * Makes the integral parts of the 'demo' web application.
  */
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 30c1719d8b..39edc50d27 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -18,8 +18,6 @@
  */
 package demoapp.webapp.wicket.jpa;
 
-import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -72,9 +70,6 @@ import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
     // Custom Demo UI (Wicket Viewer)
     DemoAppWicketCommon.class,
 
-    // bypassing security for kroviz development
-    CausewayModuleSecurityBypass.class,
-
     // Persistence/Converters (JPA)
     CausewayModuleValAsciidocPersistenceJpa.class,
     CausewayModuleValMarkdownPersistenceJpa.class,


[causeway] 03/06: Merge remote-tracking branch 'origin/spring6' into CAUSEWAY-3264

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 3c448fa39ecea0c24ed27c88ed8c33ce076e71e5
Merge: 166659749b 02e2149706
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Apr 25 19:11:33 2023 +0200

    Merge remote-tracking branch 'origin/spring6' into CAUSEWAY-3264

 antora/supplemental-ui/doap_causeway.rdf           |    4 +-
 .../applib/events/domain/AbstractDomainEvent.java  |   10 +-
 .../org/apache/causeway/applib/id/LogicalType.java |    3 +-
 .../causeway/applib/value/Password_Test.java       |    4 +-
 .../commons/internal/assertions/_Assert.java       |   19 +
 .../_testing/MetaModelContext_forTesting.java      |    1 +
 .../core/metamodel/commons/StringExtensions.java   |   14 +-
 .../core/metamodel/execution/ActionExecutor.java   |  232 ++++
 .../metamodel/execution/MemberExecutorService.java |  106 +-
 .../core/metamodel/execution/PropertyModifier.java |  229 ++++
 .../metamodel/facets/DomainEventFacetAbstract.java |   72 +-
 .../core/metamodel/facets/DomainEventHelper.java   |   10 +-
 .../core/metamodel/facets/DomainEventHolder.java   |   91 ++
 .../core/metamodel/facets/FacetFactory.java        |    5 +-
 .../core/metamodel/facets/FacetedMethod.java       |   19 +-
 .../core/metamodel/facets/ImperativeAspect.java    |    4 +-
 .../action/ActionAnnotationFacetFactory.java       |   62 +-
 .../action/invocation/ActionDomainEventFacet.java  |   87 +-
 .../action/invocation/ActionInvocationFacet.java   |    5 +-
 .../invocation/ActionInvocationFacetAbstract.java  |   42 +-
 .../invocation/ActionInvocationFacetForAction.java |   60 +
 .../ActionInvocationFacetForDomainEvent.java       |  239 ----
 ...ocationFacetForMixedInPropertyOrCollection.java |   69 +
 .../ActionParameterValidationFacetViaMethod.java   |    4 +-
 .../method/ActionValidationFacetViaMethod.java     |    4 +-
 .../facets/collections/CollectionFacet.java        |    4 +-
 .../CollectionAccessorFacetViaAccessor.java        |    8 +-
 .../CollectionAnnotationFacetFactory.java          |   35 +-
 .../modify/CollectionDomainEventFacet.java         |   92 +-
 .../method/DisableForContextFacetViaMethod.java    |    4 +-
 .../method/HideForContextFacetViaMethod.java       |    4 +-
 .../autocomplete/AutoCompleteFacetAbstract.java    |    4 +-
 .../object/callbacks/CallbackFacetAbstract.java    |    4 +-
 .../choices/ChoicesFacetFromBoundedAbstract.java   |    4 +-
 .../DomainObjectAnnotationFacetFactory.java        |   16 +-
 ...ObjectLayoutAnnotationUsingCssClassUiEvent.java |    4 +-
 ...mainObjectLayoutAnnotationUsingIconUiEvent.java |    4 +-
 ...inObjectLayoutAnnotationUsingLayoutUiEvent.java |    4 +-
 ...ainObjectLayoutAnnotationUsingTitleUiEvent.java |    4 +-
 .../facets/object/entity/EntityFacet.java          |    4 +-
 .../javalang/IteratorFilteringFacetFactory.java    |   30 +-
 .../facets/object/value/CompositeValueUpdater.java |    6 +-
 .../mandatory/MandatoryFacetAbstract.java          |    4 +-
 .../objectvalue/maxlen/MaxLengthFacetAbstract.java |    4 +-
 .../ActionParameterAutoCompleteFacetViaMethod.java |    4 +-
 .../ActionParameterChoicesFacetViaMethod.java      |    4 +-
 .../ActionParameterDefaultsFacetViaMethod.java     |    6 +-
 .../ActionParameterDisabledFacetViaMethod.java     |    4 +-
 .../ActionParameterHiddenFacetViaMethod.java       |    4 +-
 .../ActionParameterValidationFacetViaMethod.java   |    6 +-
 .../accessor/PropertyAccessorFacetViaAccessor.java |    8 +-
 .../method/PropertyAutoCompleteFacetMethod.java    |    8 +-
 .../method/PropertyChoicesFacetViaMethod.java      |    4 +-
 .../method/PropertyDefaultFacetViaMethod.java      |    4 +-
 .../property/PropertyAnnotationFacetFactory.java   |   83 +-
 .../property/modify/PropertyDomainEventFacet.java  |  104 +-
 .../modify/PropertyModifyFacetAbstract.java        |  111 ++
 ...nt.java => PropertyModifyFacetForClearing.java} |   15 +-
 ...ent.java => PropertyModifyFacetForSetting.java} |   14 +-
 ...tySetterOrClearFacetForDomainEventAbstract.java |  294 -----
 .../clear/PropertyClearFacetViaClearMethod.java    |    4 +-
 .../clear/PropertyClearFacetViaSetterMethod.java   |    4 +-
 ...PropertyInitializationFacetViaSetterMethod.java |    4 +-
 .../modify/PropertySetterFacetViaSetterMethod.java |    4 +-
 .../method/PropertyValidateFacetViaMethod.java     |    4 +-
 .../interactions/ActionArgUsabilityContext.java    |    6 +-
 .../interactions/ActionArgValidityContext.java     |    6 +-
 .../interactions/ActionArgVisibilityContext.java   |    6 +-
 .../interactions/ActionUsabilityContext.java       |    4 +-
 .../interactions/ActionValidityContext.java        |    4 +-
 .../interactions/ActionVisibilityContext.java      |    4 +-
 .../interactions/CollectionAccessContext.java      |    4 +-
 .../interactions/CollectionVisibilityContext.java  |    4 +-
 .../metamodel/interactions/ObjectTitleContext.java |    4 +-
 .../interactions/ObjectValidityContext.java        |    4 +-
 .../interactions/ObjectVisibilityContext.java      |    4 +-
 .../metamodel/interactions/ParseValueContext.java  |    6 +-
 .../interactions/PropertyAccessContext.java        |    6 +-
 .../interactions/PropertyModifyContext.java        |    6 +-
 .../interactions/PropertyUsabilityContext.java     |    4 +-
 .../interactions/PropertyVisibilityContext.java    |    4 +-
 .../managed/ParameterNegotiationModel.java         |    4 +-
 .../managed/PropertyNegotiationModel.java          |    4 +-
 .../interactions/managed/_BindingUtil.java         |    8 +-
 .../methods/MethodFilteringFacetFactory.java       |    4 +-
 .../core/metamodel/object/ManagedObject.java       |    6 +-
 .../core/metamodel/object/ManagedObjects.java      |    8 +-
 ...{MmAssertionUtil.java => MmAssertionUtils.java} |    2 +-
 .../object/{MmDebugUtil.java => MmDebugUtils.java} |    2 +-
 .../{MmEntityUtil.java => MmEntityUtils.java}      |   14 +-
 .../core/metamodel/object/MmEventUtils.java        |   72 ++
 .../{MmInvokeUtil.java => MmInvokeUtils.java}      |   22 +-
 .../{MmRenderUtil.java => MmRenderUtils.java}      |    2 +-
 .../object/{MmSpecUtil.java => MmSpecUtils.java}   |    4 +-
 .../object/{MmTitleUtil.java => MmTitleUtils.java} |    2 +-
 .../{MmUnwrapUtil.java => MmUnwrapUtils.java}      |   16 +-
 ...mVisibilityUtil.java => MmVisibilityUtils.java} |   12 +-
 .../core/metamodel/object/_InternalTitleUtil.java  |    2 +-
 .../metamodel/object/_ManagedObjectSpecified.java  |    6 +-
 .../memento/ObjectMementoForScalar.java            |    4 +-
 ...nthesizeDomainEventsForMixinPostProcessor.java} |   52 +-
 .../dflt/ProgrammingModelFacetsJava11.java         |    4 +-
 .../objectlifecycle/PropertyChangeRecord.java      |    4 +-
 .../services/title/TitleServiceDefault.java        |    4 +-
 .../core/metamodel/spec/ObjectSpecification.java   |   19 +-
 .../specloader/specimpl/ObjectActionDefault.java   |  108 +-
 .../specloader/specimpl/ObjectActionMixedIn.java   |   21 +-
 .../specloader/specimpl/ObjectMemberAbstract.java  |    1 -
 .../specimpl/OneToManyAssociationMixedIn.java      |   36 +-
 .../specimpl/OneToOneAssociationDefault.java       |    9 +-
 .../specimpl/OneToOneAssociationMixedIn.java       |   44 +-
 .../specloader/specimpl/_MixedInMemberFactory.java |    4 +-
 .../specimpl/_MixedInMemberNamingStrategy.java     |    4 +-
 .../valuesemantics/EnumValueSemanticsAbstract.java |    4 +-
 .../core/metamodel/MetaModelTestAbstract.java      |    7 +-
 .../core/metamodel/commons/NameUtilTest.java       |   16 +-
 .../core/metamodel/facetapi/FacetAbstractTest.java |   18 +-
 .../Annotations_synthesizeElseOnClass_Test.java    |  105 +-
 ...HelperTest_newCollectionDomainEvent_forAdd.java |   13 +-
 ...perTest_newCollectionDomainEvent_forRemove.java |   13 +-
 .../metamodel/facets/FacetFactoryTestAbstract.java |  403 ++++--
 .../metamodel/facets/ObjectAdapterUtilsTest.java   |   28 +-
 .../causeway/core/metamodel/facets/_Utils.java     |   25 +-
 .../actions/ActionMethodsFacetFactoryTest.java     |  163 +--
 .../actions/IteratorFilteringFacetFactoryTest.java |   30 +-
 .../action/ActionAnnotationFacetFactoryTest.java   |   12 -
 ...nnotationFacetFactoryTest_ActionInvocation.java |  175 ++-
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  189 ---
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |    6 +-
 ...ActionAnnotationFacetFactoryTest_Semantics.java |    6 +-
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |   10 +-
 ...notationFacetFactoryTest_commandPublishing.java |    8 +-
 ...tionAnnotationFacetFactoryTest_domainEvent.java |  327 +++++
 ...tationFacetFactoryTest_executionPublishing.java |   26 +-
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |    2 +-
 .../PrototypeFacetAnnotationFactoryTest.java       |    5 +-
 ...kmarkableAnnotationFacetFactoryTest_action.java |    2 +-
 .../ActionLayoutAnnotationFacetFactoryTest.java    |   30 +-
 ...MenuFacetFromDomainServiceFacetFactoryTest.java |    8 +-
 ...ava => CollectionAccessorFacetFactoryTest.java} |   64 +-
 .../CollectionAnnotationFacetFactoryTest.java      |  338 ++++-
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |    6 +-
 .../CollectionLayoutAnnotationFactoryTest.java     |    4 +-
 .../callback/CallbackFacetFactoryTestAbstract.java |    2 +-
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |   68 -
 .../DomainObjectLayoutFactoryTest.java             |    1 +
 .../DomainServiceFacetAnnotationFactoryTest.java   |    4 +-
 .../DomainServiceLayoutFacetFactoryTest.java       |   13 +-
 .../ident/cssclass/CssClassFacetMethodTest.java    |   40 +-
 .../CssClassFacetMethodWithProblemTest.java        |    4 +-
 .../object/ident/icon/IconFacetMethodTest.java     |    2 +-
 .../title/TitleAnnotationFacetFactoryTest.java     |   16 +-
 .../ident/title/TitleFacetViaMethodTest.java       |    6 +-
 .../title/TitleFacetViaMethodsFactoryTest.java     |    7 +-
 .../title/TitleFacetViaTitleAnnotationTest.java    |   28 +-
 .../object/mixin/MixinFacetAbstract_Test.java      |   42 +-
 .../navparent/NavigableParentFacetMethodTest.java  |    8 +-
 .../NavigableParentAnnotationFacetFactoryTest.java |   49 +-
 .../ObjectSupportFacetFactoryTestAbstract.java     |    2 +-
 .../memberorder/DeweyOrderComparatorTest.java      |   53 +-
 .../ordering/memberorder/DeweyOrderSetTest.java    |   79 +-
 .../ordering/memberorder/LayoutOrderTest.java      |    6 +-
 ...cetForParameterLayoutAnnotationFactoryTest.java |    9 +-
 ...cetForParameterLayoutAnnotationFactoryTest.java |    5 +-
 .../PropertyMethodsFacetFactoryTest.java           |  123 +-
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |    4 +-
 .../MandatoryAnnotationFacetFactoryTest.java       |    2 +-
 .../PropertyAnnotationFacetFactoryTest.java        |  450 ++++---
 ...tionWithSnapshotOnPropertyFacetFactoryTest.java |    2 +-
 ...llableAnnotationOnPropertyFacetFactoryTest.java |    8 +-
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |    4 +-
 .../PropertyLayoutAnnotationFactoryTest.java       |    6 +-
 .../BigDecimalValueSemanticsProviderTest.java      |   11 +-
 .../value/BigIntValueSemanticsProviderTest.java    |   10 +-
 .../value/BlobValueSemanticsProviderTest.java      |   18 +-
 .../value/BooleanValueSemanticsProviderTest.java   |   16 +-
 .../value/ByteValueSemanticsProviderTest.java      |    8 +-
 .../value/CharacterValueSemanticsProviderTest.java |   12 +-
 .../value/ClobValueSemanticsProviderTest.java      |   16 +-
 .../value/DoubleValueSemanticsProviderTest.java    |   13 +-
 .../value/FloatValueSemanticsProviderTest.java     |   11 +-
 .../value/IntValueSemanticsProviderTest.java       |   10 +-
 .../JavaSqlDateValueSemanticsProviderTest.java     |    8 +-
 .../value/JavaTimeValueSemanticsProviderTest.java  |   16 +-
 .../value/LongValueSemanticsProviderTest.java      |   10 +-
 .../value/PasswordValueSemanticsProviderTest.java  |    6 +-
 .../value/ShortValueSemanticsProviderTest.java     |   12 +-
 .../value/StringValueSemanticsProviderTest.java    |   30 +-
 .../ValueSemanticsProviderAbstractTestCase.java    |   26 +-
 .../ValueSemanticsAnnotationFacetFactoryTest.java  |   83 +-
 .../interactions/InteractionUtils_isA_Test.java    |   32 +-
 .../objects/ObjectActionLayoutXmlDefaultTest.java  |    6 +-
 ...erviceInjectorDefaultTest_validateServices.java |   80 --
 .../services/appfeat/ApplicationFeatureIdTest.java |  247 ++--
 .../metamodel/services/grid/GridLoadingTest.java   |    4 +-
 .../metamodel/MetaModelServiceDefaultTest.java     |   10 +-
 .../metamodel/spec/TypeOfAnyCardinalityTest.java   |   24 +-
 .../SpecificationLoaderTestAbstract.java           |  105 --
 .../SpecificationLoaderTest_nonScalar.java         |  132 --
 .../specloader/SpecificationLoaderTest_value.java  |   45 -
 .../SpecificationLoaderTypeRecognitionTest.java    |  128 ++
 .../{ReflectorTestPojo.java => TestPojo.java}      |    4 +-
 ...ionParameterAbstractTest_getId_and_getName.java |    6 +-
 .../TemporalValueSemanticsProviderTest.java        |    2 +-
 .../executor/MemberExecutorServiceDefault.java     |  129 +-
 .../core/runtimeservices/executor/_Xray.java       |    6 +-
 .../repository/RepositoryServiceDefault.java       |   16 +-
 .../handlers/DomainObjectInvocationHandler.java    |   18 +-
 .../RuntimeServicesTestAbstract.java               |    5 +-
 .../wrapper/WrapperFactoryDefaultTest.java         |    5 +-
 .../src/main/java/demoapp/dom/DemoModuleJpa.java   |    2 +
 .../ActionChoicesFromPage-description.adoc         |    2 +-
 .../ActionCommandPublishingPage-description.adoc   |    4 +-
 .../ActionDomainEventPage-description.adoc         |    4 +-
 .../ActionExecutionPublishingPage-description.adoc |    4 +-
 .../ActionRestrictToPage-description.adoc          |    2 +-
 .../semantics/ActionSemanticsPage-description.adoc |    6 +-
 .../typeOf/ActionTypeOfPage-description.adoc       |    2 +-
 .../ActionLayoutAssociateWithPage-description.adoc |    2 +-
 .../ActionLayoutCssClassPage-description.adoc      |    2 +-
 .../ActionLayoutCssClassFaPage-description.adoc    |    2 +-
 .../ActionLayoutDescribedAsPage-description.adoc   |    5 +-
 .../ActionLayoutFieldSetPage-description.adoc      |    2 +-
 .../hidden/ActionLayoutHiddenPage-description.adoc |    8 +-
 .../named/ActionLayoutNamedPage-description.adoc   |    2 +-
 .../ActionLayoutPositionPage-description.adoc      |    2 +-
 .../ActionLayoutPromptStylePage-description.adoc   |    2 +-
 ...ActionLayoutRedirectPolicyPage-description.adoc |    2 +-
 .../ActionLayoutSequencePage-description.adoc      |    2 +-
 .../CollectionDomainEventPage-description.adoc     |    4 +-
 .../DomainObjectAliasedPage-description.adoc       |    8 +-
 .../DomainObjectAutoCompletePage-description.adoc  |    4 +-
 .../DomainObjectBoundingPage-description.adoc      |    2 +-
 ...ObjectEntityChangePublishingVm-description.adoc |    2 +-
 .../DomainObjectIntrospectionPage-description.adoc |    6 +-
 .../DomainObjectMixinMethodPage-description.adoc   |    4 +-
 .../DomainObjectMixinMethodJpa-description.adoc    |    2 +-
 .../DomainObjectNatureViewModel-description.adoc   |    2 +-
 ...DomainObjectXxxDomainEventPage-description.adoc |    4 +-
 ...ainObjectXxxLifecycleEventPage-description.adoc |   30 +-
 ...ainObjectLayoutBookmarkingPage-description.adoc |    6 +-
 ...DomainObjectLayoutCssClassPage-description.adoc |    2 +-
 ...mainObjectLayoutCssClassFaPage-description.adoc |    2 +-
 ...ainObjectLayoutDescribedAsPage-description.adoc |    2 +-
 .../DomainObjectLayoutNamedPage-description.adoc   |    2 +-
 .../DomainObjectLayoutPagedPage-description.adoc   |    4 +-
 ...ObjectLayoutTableDecoratorPage-description.adoc |    4 +-
 ...mainObjectLayoutXxxUiEventPage-description.adoc |   10 +-
 .../domain/properties/Property/PropertyMenu.java   |   21 +-
 .../PropertyCommandPublishingPage-description.adoc |    4 +-
 .../PropertyDomainEventPage-description.adoc       |    4 +-
 ...ropertyExecutionPublishingPage-description.adoc |    4 +-
 .../PropertyFileAcceptPage-description.adoc        |    2 +-
 .../PropertyMaxLengthPage-description.adoc         |    2 +-
 .../PropertyMustSatisfyPage-description.adoc       |    9 +-
 .../OptionalityOptionalMetaAnnotation.java         |   43 -
 .../PropertyOptionalityPage-description.adoc       |  104 +-
 .../optionality/PropertyOptionalityPage.java       |   61 +-
 .../optionality/PropertyOptionalityPage.layout.xml |   11 +-
 ...> PropertyOptionalityPage_updateMandatory.java} |   21 +-
 ...=> PropertyOptionalityPage_updateNullable.java} |   28 +-
 ...=> PropertyOptionalityPage_updateOptional.java} |   20 +-
 ...ityPage_updateWithMetaAnnotationOverridden.java |   62 -
 ...PropertyProjectingChildEntity-description.adoc} |   12 +-
 .../PropertyProjectingChildEntity.java             |    5 +-
 .../PropertyProjectingChildEntity.layout.xml       |    0
 .../PropertyProjectingChildSeeding.java            |    3 +-
 .../{child => }/PropertyProjectingChildVm.java     |   36 +-
 .../PropertyProjectingPage-description.adoc        |   86 +-
 .../projecting/PropertyProjectingPage.java         |    1 -
 .../PropertyProjectingPage_returnsChildren.java    |    2 -
 ...ojectingChildJdo-description.adoc => diag.adoc} |   39 +-
 .../PropertyProjectingChildJdo-description.adoc    |   12 +-
 .../projecting/jdo/PropertyProjectingChildJdo.java |    2 +-
 .../PropertyProjectingChildJpa-description.adoc    |   12 +-
 .../projecting/jpa/PropertyProjectingChildJpa.java |    2 +-
 .../PropertyRegexPatternPage-description.adoc      |   77 +-
 .../regexPattern/PropertyRegexPatternPage.java     |   49 +-
 .../PropertyRegexPatternPage.layout.xml            |    7 +-
 ...opertyRegexPatternPage_updateEmailAddress.java} |   35 +-
 ...yRegexPatternPage_updateWithMetaAnnotation.java |   58 -
 ...ernPage_updateWithMetaAnnotationOverridden.java |   65 -
 ...RegexPatternPage_updateWithParameterLayout.java |   63 -
 ...edMetaAnnotation.java => PropertySnapshot.java} |   37 +-
 ...Page.layout.xml => PropertySnapshot.layout.xml} |   45 +-
 .../snapshot/PropertySnapshotPage-description.adoc |  106 +-
 .../Property/snapshot/PropertySnapshotPage.java    |   84 +-
 .../snapshot/PropertySnapshotPage.layout.xml       |   14 +-
 .../snapshot/PropertySnapshotPage_friends.java     |   30 +
 .../PropertySnapshotPage_takeXmlSnapshot.java      |   11 +-
 ...nnotation.java => PropertySnapshotSeeding.java} |   30 +-
 .../jpa/PropertySnapshotJpa-description.adoc}      |    3 +-
 .../snapshot/jpa/PropertySnapshotJpa.java}         |   61 +-
 .../snapshot/jpa/PropertySnapshotJpaEntities.java  |   30 +-
 .../PropertyLayout/PropertyLayoutMenu.java         |   33 +-
 .../cssClass/CssClassRedMetaAnnotation.java        |   43 -
 .../PropertyLayoutCssClassPage-description.adoc    |  136 +-
 .../cssClass/PropertyLayoutCssClassPage.java       |   37 +-
 .../cssClass/PropertyLayoutCssClassPage.layout.xml |    6 +-
 .../PropertyLayoutCssClassPage_mixinProperty.java  |   49 -
 ...sClassPage_mixinPropertyWithMetaAnnotation.java |   47 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   48 -
 ... => PropertyLayoutCssClassPage_updateName.java} |   18 +-
 ...ayoutCssClassPage_updateWithMetaAnnotation.java |   58 -
 ...assPage_updateWithMetaAnnotationOverridden.java |   61 -
 .../describedAs/DescribedAsMetaAnnotation.java     |   43 -
 .../PropertyLayoutDescribedAsPage-description.adoc |  130 +-
 .../describedAs/PropertyLayoutDescribedAsPage.java |   43 +-
 .../PropertyLayoutDescribedAsPage.layout.xml       |   13 +-
 ...ropertyLayoutDescribedAsPage_mixinProperty.java |   46 -
 ...ibedAsPage_mixinPropertyWithMetaAnnotation.java |   47 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   48 -
 ... PropertyLayoutDescribedAsPage_updateName.java} |   11 +-
 ...utDescribedAsPage_updateWithMetaAnnotation.java |   58 -
 ...dAsPage_updateWithMetaAnnotationOverridden.java |   59 -
 .../PropertyLayoutHiddenPage-description.adoc      |    8 +-
 .../LabelPositionLeftMetaAnnotation.java           |   44 -
 .../LabelPositionTopMetaAnnotation.java            |   44 -
 ...ropertyLayoutLabelPositionPage-description.adoc |  233 ++--
 .../PropertyLayoutLabelPositionPage.java           |  144 +--
 .../PropertyLayoutLabelPositionPage.layout.xml     |   23 +-
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   49 -
 ...itionPage_updateBooleanLabelPositionRight.java} |   22 +-
 ...LabelPositionPage_updateLabelPositionLeft.java} |   36 +-
 ...LabelPositionPage_updateLabelPositionNone.java} |   19 +-
 ...itionPage_updateLabelPositionNotSpecified.java} |   29 +-
 ...tLabelPositionPage_updateLabelPositionTop.java} |   39 +-
 ...rtyLayoutLabelPositionPage_updateProperty.java} |   23 +-
 ...yLayoutLabelPositionPage_updateVariantLeft.java |   60 -
 ...LayoutLabelPositionPage_updateVariantRight.java |   60 -
 ...LabelPositionPage_updateWithMetaAnnotation.java |   58 -
 ...ionPage_updateWithMetaAnnotationOverridden.java |   61 -
 .../multiLine/MultiLine10MetaAnnotation.java       |   43 -
 .../PropertyLayoutMultiLinePage-description.adoc   |   96 +-
 .../multiLine/PropertyLayoutMultiLinePage.java     |   42 +-
 .../PropertyLayoutMultiLinePage.layout.xml         |    8 +-
 .../PropertyLayoutMultiLinePage_mixinProperty.java |   47 -
 ...tiLinePage_mixinPropertyWithMetaAnnotation.java |   47 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   49 -
 ...youtMultiLinePage_updateWithMetaAnnotation.java |   58 -
 ...inePage_updateWithMetaAnnotationOverridden.java |   61 -
 .../PropertyLayout/named/NamedMetaAnnotation.java  |   43 -
 .../named/PropertyLayoutNamedPage-description.adoc |   68 +-
 .../named/PropertyLayoutNamedPage.java             |   39 +-
 .../named/PropertyLayoutNamedPage.layout.xml       |    4 +-
 .../PropertyLayoutNamedPage_mixinProperty.java     |   47 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   48 -
 ...tyLayoutNamedPage_updateWithMetaAnnotation.java |   58 -
 ...medPage_updateWithMetaAnnotationOverridden.java |   60 -
 ...yLayoutNamedPage_updateWithParameterLayout.java |    2 -
 .../navigable/FileNodeVm-description.adoc          |   39 +-
 .../PropertyLayout/navigable/FileNodeVm.java       |   19 +-
 .../PropertyLayout/navigable/FileNodeVm.layout.xml |    1 -
 ...odeVm_returnsTree.java => FileNodeVm_tree.java} |   16 +-
 .../PropertyLayoutRenderDayPage-description.adoc   |  152 ---
 .../renderDay/PropertyLayoutRenderDayPage.java     |  141 ---
 .../PropertyLayoutRenderDayPage.layout.xml         |   62 -
 ...nderDayPage_mixinEndDateWithMetaAnnotation.java |   49 -
 ...e_mixinEndDateWithMetaAnnotationOverridden.java |   52 -
 ...nderDayPage_mixinEndDateWithPropertyLayout.java |   49 -
 ...derDayPage_updateEndDateWithMetaAnnotation.java |   60 -
 ..._updateEndDateWithMetaAnnotationOverridden.java |   63 -
 .../RenderDayMetaAnnotationEndDateExclusive.java   |   42 -
 .../RenderDayMetaAnnotationStartDateInclusive.java |   41 -
 .../PropertyLayoutRepaintingPage-description.adoc  |  104 +-
 .../repainting/PropertyLayoutRepaintingPage.java   |   58 +-
 .../PropertyLayoutRepaintingPage.layout.xml        |    8 +-
 ...PropertyLayoutRepaintingPage_mixinProperty.java |   50 -
 ...intingPage_mixinPropertyWithMetaAnnotation.java |   49 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   52 -
 .../RepaintingNoRepaintMetaAnnotation.java         |   41 -
 .../RepaintingRepaintMetaAnnotation.java           |   41 -
 ...ropertyLayoutTypicalLengthPage-description.adoc |  123 +-
 .../PropertyLayoutTypicalLengthPage.java           |   38 +-
 .../PropertyLayoutTypicalLengthPage.layout.xml     |   11 +-
 ...pertyLayoutTypicalLengthPage_mixinProperty.java |   47 -
 ...LengthPage_mixinPropertyWithMetaAnnotation.java |   47 -
 ..._mixinPropertyWithMetaAnnotationOverridden.java |   48 -
 ...ropertyLayoutTypicalLengthPage_updateName.java} |   18 +-
 ...TypicalLengthPage_updateWithMetaAnnotation.java |   58 -
 ...gthPage_updateWithMetaAnnotationOverridden.java |   60 -
 .../typicalLength/TypicalLengthMetaAnnotation.java |   43 -
 .../ValueSemantics/ValueSemanticsMenu.java}        |   58 +-
 ...anticsDateRenderAdjustDaysPage-description.adoc |   72 ++
 .../ValueSemanticsDateRenderAdjustDaysPage.java}   |   75 +-
 ...ueSemanticsDateRenderAdjustDaysPage.layout.xml} |   11 +-
 ...icsDateRenderAdjustDaysPage_downloadAsXml.java} |   10 +-
 ...icsDateRenderAdjustDaysPage_updateEndDate.java} |   20 +-
 .../src/main/java/demoapp/dom/menubars.layout.xml  |    7 +-
 .../demoapp/dom/services/core/ServicesMenu.java    |   22 -
 .../XmlSnapshotParentVm-description.adoc           |   85 --
 .../XmlSnapshotParentVm-description.html           |  612 ---------
 .../xmlSnapshotService/XmlSnapshotParentVm.java    |   89 --
 .../XmlSnapshotParentVm.layout.xml                 |   63 -
 .../XmlSnapshotParentVm_takeXmlSnapshot.java       |  102 --
 .../child/XmlSnapshotChildVm.java                  |   62 -
 .../child/XmlSnapshotChildVm.layout.xml            |   55 -
 .../core/xmlSnapshotService/class-diagram.svg      |   40 -
 .../xmlSnapshotService/peer/XmlSnapshotPeerVm.java |   80 --
 .../peer/XmlSnapshotPeerVm.layout.xml              |   64 -
 .../child/XmlSnapshotPeerChildVm-description.adoc  |    3 -
 .../dom/types/causeway/CausewayTypesMenu.java      |    8 +
 .../passwords/CausewayPasswords-description.adoc   |    2 +-
 .../dom/types/causeway/treenode/FileNodeType.java  |   20 +-
 .../causeway/treenode/FileNodeVm-DIRECTORY.svg     |   47 +
 .../types/causeway/treenode/FileNodeVm-FILE.svg    |   44 +
 .../treenode/FileNodeVm-FILE_SYSTEM_ROOT.svg       |   44 +
 .../causeway/treenode/FileNodeVm-description.adoc  |   97 ++
 .../causeway/treenode}/FileNodeVm.java             |   49 +-
 .../causeway/treenode}/FileNodeVm.layout.xml       |    1 -
 .../causeway/treenode/FileNodeVm_tree.java}        |   29 +-
 .../causeway/treenode/FileSystemTreeAdapter.java   |   67 +
 .../causeway/treenode/FileTreeNodeService.java     |   73 ++
 .../demo/domain/src/main/resources/application.yml |    4 +-
 .../src/main/resources/static/css/application.css  |   15 +-
 .../Property/projecting/uml-class-diag.png         |  Bin 0 -> 22277 bytes
 .../Property/publishing/uml-class-diag.png         |  Bin 8859 -> 0 bytes
 .../demoapp/testing/jdo/SpinUpDemoJdoTest.java     |    4 +-
 .../demoapp/testing/jpa/SpinUpDemoJpaTest.java     |    4 +-
 ...hPdfJsViewer_IntegTest.dump_facets.approved.xml |   66 +-
 ..._MixinDomain_IntegTest.dump_facets.approved.xml |   66 +-
 ...hPdfjsViewer_IntegTest.dump_facets.approved.xml |   31 +-
 ...r_PropDomain_IntegTest.dump_facets.approved.xml |   31 +-
 .../pdfjs/wkt/ui/components/PdfJsViewerPanel.java  |    4 +-
 .../javafx/ui/components/object/ObjectViewFx.java  |    4 +-
 .../vaadin/ui/components/object/ObjectViewVaa.java |    4 +-
 .../changetracking/EntityChangeTrackerDefault.java |    4 +-
 .../MetaModelRegressionTest.verify.approved.xml    | 1324 ++++++++++++++------
 .../interact/CollectionInteractionTest.java        |    4 +-
 .../JpaGeneratedLongIdEntityLifecycleTest.java     |   14 +-
 ...JpaNonGeneratedStringIdEntityLifecycleTest.java |   14 +-
 .../util/interaction/DataTableTester.java          |   12 +-
 .../interaction/DomainObjectTesterFactory.java     |   10 +-
 .../vega/ui/wkt/components/VegaComponentWkt.java   |    4 +-
 .../viewer/commons/model/action/UiActionForm.java  |    4 +-
 .../binding/BindingConverterForManagedObject.java  |    4 +-
 .../viewer/commons/model/object/UiObject.java      |    4 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.java |    4 +-
 .../resources/DomainObjectResourceServerside.java  |    4 +-
 .../wicket/model/models/ScalarUnwrappingModel.java |    4 +-
 .../viewer/wicket/ui/components/actions/_Xray.java |    8 +-
 .../summary/CollectionContentsAsSummary.java       |    4 +-
 .../entity/icontitle/EntityIconAndTitlePanel.java  |    4 +-
 .../viewer/wicket/ui/components/scalars/_Xray.java |    4 +-
 .../components/scalars/markup/MarkupComponent.java |    4 +-
 .../ui/components/tree/_TreeNodeMemento.java       |    4 +-
 .../ui/components/value/StandaloneValuePanel.java  |    4 +-
 .../wicket/ui/panels/FormExecutorDefault.java      |    4 +-
 .../test/components/scalars/ConverterTester.java   |    3 +
 .../choices/ChoiceProviderTestAbstract.java        |    2 +
 450 files changed, 6778 insertions(+), 10288 deletions(-)


[causeway] 02/06: CAUSEWAY-3264 vega 1/n, asciidoctor, merge origin/spring6

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 166659749b789a49c9d4e65005dc4a80f9c247dd
Merge: b2f92ac1ef e4e2964c2c
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Apr 25 19:10:50 2023 +0200

    CAUSEWAY-3264 vega 1/n, asciidoctor, merge origin/spring6

 .editorconfig                                      |  364 +++
 .../workflows/ci-build-artifacts-no-push-maven.yml |    4 +-
 .gitignore                                         |    3 +
 .run/DemoAppWicketJpa.run.xml                      |    5 +-
 .../ROOT/pages/building-apache-causeway.adoc       |    2 +-
 antora/playbooks/site-incubator.yml                |    6 +-
 antora/playbooks/site.yml                          |    6 +-
 antora/supplemental-ui/index.html                  |    8 +
 .../applib/events/domain/AbstractDomainEvent.java  |   26 +-
 .../applib/events/domain/ActionDomainEvent.java    |   14 -
 bom/pom.xml                                        |   24 +-
 .../metamodel/facets/DomainEventFacetAbstract.java |   99 +
 .../core/metamodel/facets/DomainEventHelper.java   |   18 +-
 .../facets/SingleClassValueFacetAbstract.java      |    2 +-
 .../action/ActionAnnotationFacetFactory.java       |   71 +-
 .../action/invocation/ActionDomainEventFacet.java  |  237 +-
 .../invocation/ActionDomainEventFacetAbstract.java |  154 --
 .../invocation/ActionDomainEventFacetDefault.java  |   32 -
 .../ActionDomainEventFacetForActionAnnotation.java |   31 -
 .../invocation/ActionInvocationFacetAbstract.java  |   36 +-
 ...va => ActionInvocationFacetForDomainEvent.java} |   27 +-
 ...ionFacetForDomainEventFromActionAnnotation.java |   38 -
 ...onInvocationFacetForDomainEventFromDefault.java |   38 -
 .../CollectionAnnotationFacetFactory.java          |   48 +-
 .../modify/CollectionDomainEventFacet.java         |  149 +-
 .../modify/CollectionDomainEventFacetAbstract.java |   75 -
 .../modify/CollectionDomainEventFacetDefault.java  |   31 -
 ...ionDomainEventFacetForCollectionAnnotation.java |   44 -
 .../DomainObjectAnnotationFacetFactory.java        |   18 +-
 ...EventDefaultFacetForDomainObjectAnnotation.java |   25 +-
 ...EventDefaultFacetForDomainObjectAnnotation.java |   24 +-
 ...EventDefaultFacetForDomainObjectAnnotation.java |   24 +-
 .../property/PropertyAnnotationFacetFactory.java   |  109 +-
 ....java => PropertyClearFacetForDomainEvent.java} |   15 +-
 ...rFacetForDomainEventFromPropertyAnnotation.java |   40 -
 .../property/modify/PropertyDomainEventFacet.java  |  238 +-
 .../modify/PropertyDomainEventFacetAbstract.java   |  168 --
 .../modify/PropertyDomainEventFacetDefault.java    |   39 -
 ...pertyDomainEventFacetForPropertyAnnotation.java |   39 -
 ...java => PropertySetterFacetForDomainEvent.java} |   15 +-
 ...rFacetForDomainEventFromPropertyAnnotation.java |   40 -
 ...tySetterOrClearFacetForDomainEventAbstract.java |   25 +-
 .../metamodel/interactions/InteractionHead.java    |    4 +-
 .../TweakDomainEventsForMixinPostProcessor.java    |  132 +-
 .../core/metamodel/spec/feature/ObjectAction.java  |    2 +-
 .../AbstractFacetFactoryJupiterTestCase.java       |  138 --
 .../metamodel/facets/AbstractFacetFactoryTest.java |  166 --
 ...nEventHelperTest_newActionInteractionEvent.java |    6 +-
 ...HelperTest_newCollectionDomainEvent_forAdd.java |    6 +-
 ...perTest_newCollectionDomainEvent_forRemove.java |    6 +-
 ...HelperTest_newPropertyDomainEvent_forClear.java |    4 +-
 ...elperTest_newPropertyDomainEvent_forModify.java |    4 +-
 .../metamodel/facets/FacetFactoryTestAbstract.java |  284 +++
 .../causeway/core/metamodel/facets/Utils.java      |   63 -
 .../causeway/core/metamodel/facets/_Utils.java     |   98 +
 .../actions/ActionMethodsFacetFactoryTest.java     |  186 +-
 .../actions/IteratorFilteringFacetFactoryTest.java |   63 +-
 .../action/ActionAnnotationFacetFactoryTest.java   |   32 +-
 ...nnotationFacetFactoryTest_ActionInvocation.java |  139 +-
 ...ctionAnnotationFacetFactoryTest_Invocation.java |  220 +-
 ...ctionAnnotationFacetFactoryTest_RestrictTo.java |   63 +-
 ...ActionAnnotationFacetFactoryTest_Semantics.java |   69 +-
 .../ActionAnnotationFacetFactoryTest_TypeOf.java   |  123 +-
 ...notationFacetFactoryTest_commandPublishing.java |   68 +-
 ...tationFacetFactoryTest_executionPublishing.java |  272 +--
 ...icsFacetFallbackToNonIdempotentFactoryTest.java |   47 +-
 .../PrototypeFacetAnnotationFactoryTest.java       |   45 +-
 ...kmarkableAnnotationFacetFactoryTest_action.java |   45 +-
 .../ActionLayoutAnnotationFacetFactoryTest.java    |  110 +-
 ...MenuFacetFromDomainServiceFacetFactoryTest.java |  123 +-
 .../CollectionFieldMethodsFacetFactoryTest.java    |  219 +-
 .../CollectionAnnotationFacetFactoryTest.java      |  119 +-
 ...ollectionAnnotationFacetFactoryTest_typeOf.java |  112 +-
 .../CollectionLayoutAnnotationFactoryTest.java     |   64 +-
 ...okmarkableAnnotationFacetFactoryTest_class.java |   44 +-
 .../callback/CallbackFacetFactoryTestAbstract.java |   70 +-
 .../callback/CreatedCallbackFacetFactoryTest.java  |   12 +-
 .../callback/LoadedCallbackFacetFactoryTest.java   |   12 +-
 .../PersistedCallbackFacetFactoryTest.java         |   34 +-
 .../PersistingCallbackFacetFactoryTest.java        |   34 +-
 .../callback/RemovingCallbackFacetFactoryTest.java |   32 +-
 .../callback/UpdatedCallbackFacetFactoryTest.java  |   12 +-
 .../callback/UpdatingCallbackFacetFactoryTest.java |   12 +-
 ...CssClassFaFacetOnTypeAnnotationFactoryTest.java |    4 +-
 .../ObjectDisabledMethodFacetFactoryTest.java      |    5 +-
 ...oicesFacetFromBoundedAnnotationFactoryTest.java |   44 +-
 .../DomainObjectAnnotationFacetFactoryTest.java    |  388 +--
 .../NamedAnnotationFacetFactoryTest.java           |    4 +-
 .../DomainObjectLayoutFactoryTest.java             |  270 +--
 .../DomainServiceFacetAnnotationFactoryTest.java   |   40 +-
 .../DomainServiceLayoutFacetFactoryTest.java       |  121 +-
 .../hidden/ObjectHiddenMethodFacetFactoryTest.java |    7 +-
 .../cssclass/CssClassFacetMethodFactoryTest.java   |   13 +-
 .../ident/cssclass/CssClassFacetMethodTest.java    |   12 +-
 .../ident/icon/IconFacetMethodFactoryTest.java     |   14 +-
 .../ident/layout/LayoutFacetFactoryTest.java       |    7 +-
 .../title/TitleAnnotationFacetFactoryTest.java     |  131 +-
 .../ident/title/TitleFacetViaMethodTest.java       |    8 +-
 .../title/TitleFacetViaMethodsFactoryTest.java     |   66 +-
 .../logicaltype/LogicalTypeInferenceTest.java      |    4 +-
 .../NavigableParentAnnotationFacetFactoryTest.java |   24 +-
 .../RecreatableObjectFacetFactoryTest.java         |   50 +-
 .../ObjectSupportFacetFactoryTestAbstract.java     |   56 +-
 .../ordering/memberorder/LayoutOrderTest.java      |  136 +-
 ...cetForParameterLayoutAnnotationFactoryTest.java |   39 +-
 ...cetForParameterLayoutAnnotationFactoryTest.java |   33 +-
 .../facets/param/name/ParameterNameFacetTest.java  |   70 +-
 .../ParameterAnnotationFacetFactoryTest.java       |  313 +--
 ...lableAnnotationOnParameterFacetFactoryTest.java |  120 +-
 ...RegExAnnotationOnParameterFacetFactoryTest.java |   74 +-
 .../PropertyMethodsFacetFactoryTest.java           |  641 +++--
 ...sabledAnnotationOnPropertyFacetFactoryTest.java |   80 +-
 .../MandatoryAnnotationFacetFactoryTest.java       |   38 +-
 .../PropertyAnnotationFacetFactoryTest.java        |  661 +++---
 ...tionWithSnapshotOnPropertyFacetFactoryTest.java |   41 +-
 ...llableAnnotationOnPropertyFacetFactoryTest.java |  100 +-
 .../RegExAnnotationOnPropertyFacetFactoryTest.java |   67 +-
 .../PropertyLayoutAnnotationFactoryTest.java       |  111 +-
 .../ValueSemanticsAnnotationFacetFactoryTest.java  |  250 +-
 .../src/main/java/demoapp/dom/DemoModuleJpa.java   |   23 +-
 .../HasAsciiDocDescription_description.java        |    3 +-
 .../HasAsciiDocDescription_sources.java            |    3 +-
 .../_infra/resources/AsciiDocConverterService.java |    1 +
 .../resources/MarkupVariableResolverService.java   |   10 +-
 .../demoapp/dom/_infra/samples/EnumSamples.java    |    3 +-
 .../demoapp/dom/_infra/samples/NameSamples.java    |    3 +-
 .../dom/_infra/seed/SeedServiceAbstract.java       |    3 +-
 .../dom/_infra/values/ValueHolderRepository.java   |    3 +-
 .../_changes/ExposeCapturedChanges_clear.java      |    3 +-
 .../dom/domain/actions/Action/ActionMenu.java      |   12 +-
 .../Action/choicesFrom/ActionChoicesFrom.java      |    2 -
 .../ActionChoicesFromPage-description.adoc         |    6 +-
 .../Action/choicesFrom/ActionChoicesFromPage.java  |    4 +-
 .../ActionChoicesFromPage_makeLowerCase.java       |    5 +-
 .../ActionChoicesFromPage_makeUpperCase.java       |    4 +-
 .../choicesFrom/ActionChoicesFromPage_objects.java |    9 +-
 .../choicesFrom/ActionChoicesFromSeeding.java      |    6 +-
 .../choicesFrom/jpa/ActionChoicesFromJpa.java      |    5 +-
 .../jpa/ActionChoicesFromJpaEntities.java          |    8 +-
 .../ActionCommandPublishing-description.adoc       |    2 +-
 .../ActionCommandPublishingPage-description.adoc   |    4 +-
 .../ActionCommandPublishingPage.java               |    4 +-
 ...mmandPublishingPage_changeNameNotPublished.java |    4 +-
 ...nCommandPublishingPage_changeNamePublished.java |    4 +-
 .../ActionCommandPublishingPage_objects.java       |    7 +-
 ...ionCommandPublishingPage_publishedCommands.java |    5 +-
 .../ActionCommandPublishingSeeding.java            |    6 +-
 ...onCommandPublishing_changeNameNotPublished.java |    8 +-
 ...ctionCommandPublishing_changeNamePublished.java |    6 +-
 .../ActionCommandPublishing_publishedCommands.java |    4 +-
 .../jpa/ActionCommandPublishingJpa.java            |    5 +-
 .../jpa/ActionCommandPublishingJpaEntities.java    |    8 +-
 .../ActionDomainEventPage-description.adoc         |    7 +-
 .../Action/domainEvent/ActionDomainEventPage.java  |   17 +-
 ...tionDomainEventPage_updateTextNotAnnotated.java |    4 +-
 .../ActionExecutionPublishing-description.adoc     |    2 +-
 .../ActionExecutionPublishingPage-description.adoc |    4 +-
 .../ActionExecutionPublishingPage.java             |    4 +-
 ...utionPublishingPage_changeNameNotPublished.java |    4 +-
 ...xecutionPublishingPage_changeNamePublished.java |    4 +-
 ...nExecutionPublishingPage_changeNameWrapped.java |    4 +-
 .../ActionExecutionPublishingPage_objects.java     |    7 +-
 ...xecutionPublishingPage_publishedExecutions.java |    5 +-
 .../ActionExecutionPublishingSeeding.java          |    6 +-
 ...ExecutionPublishing_changeNameNotPublished.java |    4 +-
 ...ionExecutionPublishing_changeNamePublished.java |    4 +-
 ...ionExecutionPublishing_publishedExecutions.java |    5 +-
 .../jpa/ActionExecutionPublishingJpa.java          |    5 +-
 .../jpa/ActionExecutionPublishingJpaEntities.java  |    8 +-
 .../Action/hidden/ActionHidden-description.adoc    |   48 -
 .../domain/actions/Action/hidden/ActionHidden.java |   49 -
 .../actions/Action/hidden/ActionHidden.layout.xml  |   90 -
 .../hidden/ActionHiddenPage-description.adoc       |   68 -
 .../Action/hidden/ActionHiddenPage_objects.java    |   29 -
 .../Action/hidden/ActionHiddenRepository.java      |   26 -
 .../ActionHidden_changeNameHiddenEverywhere.java   |   50 -
 .../actions/Action/hidden/jpa/ActionHiddenJpa.java |   68 -
 .../Action/hidden/jpa/ActionHiddenJpaEntities.java |   55 -
 .../ActionRestrictToPage-description.adoc          |    8 +-
 .../Action/restrictTo/ActionRestrictToPage.java    |    4 +-
 .../semantics/ActionSemanticsPage-description.adoc |   24 +-
 .../Action/semantics/ActionSemanticsPage.java      |    3 +-
 .../typeOf/ActionTypeOfPage-description.adoc       |    4 +-
 .../actions/Action/typeOf/ActionTypeOfPage.java    |    5 +-
 .../Action/typeOf/child/ActionTypeOfChildVm.java   |    3 +-
 .../actions/ActionLayout/ActionLayoutMenu.java     |    7 +-
 .../ActionLayoutAssociateWithPage-description.adoc |   68 +-
 .../ActionLayoutAssociateWithPage.java             |   24 +-
 .../ActionLayoutAssociateWithPage.layout.xml       |    2 +-
 .../child/ActionLayoutAssociateWithChildVm.java    |   19 +-
 .../ActionLayoutCssClassPage-description.adoc      |   15 +-
 .../cssClass/ActionLayoutCssClassPage.java         |   18 +-
 .../cssClass/ActionLayoutCssClassPage.layout.xml   |   19 +-
 .../ActionLayoutCssClassFaPage-description.adoc    |   10 +-
 .../cssClassFa/ActionLayoutCssClassFaPage.java     |   16 +-
 .../ActionLayoutCssClassFaPage.layout.xml          |   19 +-
 .../ActionLayoutDescribedAsPage-description.adoc   |   62 +-
 .../describedAs/ActionLayoutDescribedAsPage.java   |  120 +-
 .../ActionLayoutDescribedAsPage.layout.xml         |   28 +-
 ...ctionLayoutDescribedAsChildVm-description.adoc} |    2 +-
 .../child/ActionLayoutDescribedAsChildVm.java}     |   38 +-
 .../ActionLayoutDescribedAsChildVm.layout.xml}     |    3 +-
 .../ActionLayoutFieldSetPage-description.adoc      |   61 +-
 .../fieldSet/ActionLayoutFieldSetPage.java         |   62 +-
 .../fieldSet/ActionLayoutFieldSetPage.layout.xml   |   24 +-
 .../hidden/ActionLayoutHidden-description.adoc     |    4 +-
 .../hidden/ActionLayoutHiddenPage-description.adoc |    4 +-
 .../hidden/ActionLayoutHiddenPage.java             |    7 +-
 .../hidden/ActionLayoutHiddenPage_objects.java     |    7 +-
 .../hidden/ActionLayoutHiddenSeeding.java          |    6 +-
 .../hidden/ActionLayoutHidden_changeName.java      |    5 +-
 ...tionLayoutHidden_changeNameHiddenAllTables.java |    5 +-
 ...ionLayoutHidden_changeNameHiddenEverywhere.java |    5 +-
 ...onLayoutHidden_changeNameHiddenObjectForms.java |    5 +-
 .../hidden/jpa/ActionLayoutHiddenJpa.java          |    5 +-
 .../hidden/jpa/ActionLayoutHiddenJpaEntities.java  |    8 +-
 .../named/ActionLayoutNamedPage-description.adoc   |   68 +-
 .../ActionLayout/named/ActionLayoutNamedPage.java  |   59 +-
 .../named/ActionLayoutNamedPage.layout.xml         |   26 +-
 .../ActionLayoutPositionPage-description.adoc      |   49 +-
 .../position/ActionLayoutPositionPage.java         |   18 +-
 .../position/ActionLayoutPositionPage.layout.xml   |   19 +-
 ...tionLayoutPositionPage_layoutPanelDropDown.java |   52 -
 .../ActionLayoutPositionPage_layoutRight.java      |   52 -
 ...outPositionPage_updateNamePositionedBelow.java} |   21 +-
 ...outPositionPage_updateNamePositionedPanel.java} |   19 +-
 ...ionPage_updateNamePositionedPanelDropDown.java} |   19 +-
 ...outPositionPage_updateNamePositionedRight.java} |   19 +-
 ...utPositionPage_updateNotesPositionedBelow.java} |   20 +-
 ...utPositionPage_updateNotesPositionedPanel.java} |   22 +-
 ...onPage_updateNotesPositionedPanelDropDown.java} |   22 +-
 ...utPositionPage_updateNotesPositionedRight.java} |   22 +-
 .../ActionLayoutPromptStylePage-description.adoc   |   67 +-
 .../promptStyle/ActionLayoutPromptStylePage.java   |   34 +-
 .../ActionLayoutPromptStylePage.layout.xml         |   20 +-
 .../ActionLayoutPromptStylePage_layoutDialog.java  |   56 -
 .../ActionLayoutPromptStylePage_layoutInline.java  |   51 -
 ...LayoutPromptStylePage_layoutInlineAsIfEdit.java |   51 -
 ...outPromptStylePage_updateNamePromptInline.java} |   22 +-
 ...youtPromptStylePage_updateNamePromptModal.java} |   24 +-
 ...utPromptStylePage_updateNamePromptSidebar.java} |   23 +-
 ...StylePage_updateNotesPromptInlineAsIfEdit.java} |   21 +-
 ...ActionLayoutRedirectPolicyPage-description.adoc |   55 +-
 .../ActionLayoutRedirectPolicyPage.java            |   55 +-
 .../ActionLayoutRedirectPolicyPage.layout.xml      |   27 +-
 ...ectPolicyPage_incrementRedirectEvenIfSame.java} |   29 +-
 ...PolicyPage_incrementRedirectOnlyIfDiffers.java} |   24 +-
 .../ActionLayoutSequencePage-description.adoc      |  179 +-
 .../sequence/ActionLayoutSequencePage.java         |   64 +-
 .../sequence/ActionLayoutSequencePage.layout.xml   |   30 +-
 .../ActionLayoutSequencePage_addChild.java}        |   37 +-
 .../ActionLayoutSequencePage_noopSeqX.java}        |   34 +-
 .../ActionLayoutSequencePage_noopSeqY.java}        |   34 +-
 .../ActionLayoutSequencePage_removeChild.java}     |   37 +-
 ...age_updateNamePositionedPanelDropDownSeqX.java} |   33 +-
 ...age_updateNamePositionedPanelDropDownSeqY.java} |   33 +-
 ...equencePage_updateNamePositionedPanelSeqX.java} |   33 +-
 ...equencePage_updateNamePositionedPanelSeqY.java} |   29 +-
 ...equencePage_updateNamePositionedRightSeqX.java} |   33 +-
 ...equencePage_updateNamePositionedRightSeqY.java} |   33 +-
 .../ActionLayoutSequencePage_updateNameSeqX.java}  |   32 +-
 .../ActionLayoutSequencePage_updateNameSeqY.java}  |   32 +-
 .../ActionLayoutSequencePage_updateNameSeqZ.java}  |   32 +-
 .../ActionLayoutSequenceChildVm-description.adoc}  |    2 +-
 .../child/ActionLayoutSequenceChildVm.java}        |    9 +-
 .../child/ActionLayoutSequenceChildVm.layout.xml}  |    3 +-
 .../collections/Collection/CollectionMenu.java     |   12 +-
 .../CollectionDomainEventControlSubscriber.java    |    1 -
 .../CollectionDomainEventPage-description.adoc     |    2 +-
 .../domainEvent/CollectionDomainEventPage.java     |   21 +-
 ...ctionDomainEventPage_changeControlStrategy.java |   10 +-
 .../CollectionDomainEventPage_controlStrategy.java |    4 +-
 .../child/CollectionDomainEventChildVm.java        |    4 +-
 .../hidden/CollectionHiddenPage-description.adoc   |    6 -
 .../Collection/hidden/CollectionHiddenPage.java    |   68 -
 .../hidden/CollectionHiddenPage.layout.xml         |   61 -
 .../Collection/typeOf/CollectionTypeOfPage.java    |    5 +-
 .../cssClass/CollectionLayoutCssClassPage.java     |    5 +-
 .../CollectionLayoutDefaultViewPage.java           |    5 +-
 .../CollectionLayoutDescribedAsPage.java           |    5 +-
 .../hidden/CollectionLayoutHiddenPage.java         |    5 +-
 .../named/CollectionLayoutNamedPage.java           |    5 +-
 .../paged/CollectionLayoutPagedPage.java           |    5 +-
 .../sequence/CollectionLayoutSequencePage.java     |    5 +-
 .../CollectionLayoutSortedByComparator.java        |    3 +-
 .../sortedBy/CollectionLayoutSortedByPage.java     |    5 +-
 .../CollectionLayoutTableDecoratorPage.java        |    5 +-
 .../DomainObject/aliased/DomainObjectAliased.java  |    6 +-
 .../DomainObjectAliasedPage-description.adoc       |    2 +-
 .../aliased/DomainObjectAliasedPage_lookup.java    |    6 +-
 .../aliased/DomainObjectAliasedPage_objects.java   |    7 +-
 .../aliased/DomainObjectAliasedSeeding.java        |    2 +-
 .../aliased/jpa/DomainObjectAliasedJpa.java        |    5 +-
 .../jpa/DomainObjectAliasedJpaEntities.java        |    8 +-
 .../DomainObjectAutoCompletePage-description.adoc  |    2 +-
 .../autoComplete/DomainObjectAutoCompletePage.java |    4 +-
 .../DomainObjectAutoCompletePage_find.java         |    4 +-
 .../DomainObjectAutoCompletePage_objects.java      |    7 +-
 .../DomainObjectAutoCompleteRepository.java        |    2 +
 .../DomainObjectAutoCompleteSeeding.java           |    2 +-
 .../jpa/DomainObjectAutoCompleteJpa.java           |    7 +-
 .../jpa/DomainObjectAutoCompleteJpaEntities.java   |    4 +-
 .../DomainObjectBoundingPage-description.adoc      |    2 +-
 .../bounded/DomainObjectBoundingPage.java          |    4 +-
 .../bounded/DomainObjectBoundingPage_objects.java  |    7 +-
 .../bounded/DomainObjectBoundingSeeding.java       |    6 +-
 .../bounded/jpa/DomainObjectBoundingJpa.java       |   20 +-
 .../jpa/DomainObjectBoundingJpaEntities.java       |    4 +-
 .../bounded/jpa/DomainObjectBoundingPage_find.java |    8 +-
 .../DomainObject/editing/DomainObjectEditing.java  |    6 +-
 .../DomainObjectEditingPage-description.adoc       |    5 +-
 .../editing/DomainObjectEditingPage.java           |    6 +-
 .../editing/DomainObjectEditingPage_objects.java   |    7 +-
 .../editing/DomainObjectEditingSeeding.java        |    6 +-
 .../editing/jpa/DomainObjectEditingJpa.java        |   20 +-
 .../jpa/DomainObjectEditingJpaEntities.java        |    4 +-
 .../DomainObjectEntityChangePublishingEntity.java  |    6 +-
 ...PublishingEntity_updatePropertyUsingAction.java |    7 +-
 .../DomainObjectEntityChangePublishingSeeding.java |    6 +-
 ...ObjectEntityChangePublishingVm-description.adoc |    2 +-
 .../DomainObjectEntityChangePublishingVm.java      |    6 +-
 ...omainObjectEntityChangePublishingVm_modify.java |    6 +-
 ...mainObjectEntityChangePublishingVm_objects.java |    7 +-
 .../jdo/DomainObjectEntityChangePublishingJdo.java |   12 +-
 ...ainObjectEntityChangePublishingJdoEntities.java |    4 +-
 .../jpa/DomainObjectEntityChangePublishingJpa.java |   20 +-
 ...ainObjectEntityChangePublishingJpaEntities.java |    4 +-
 .../DomainObjectIntrospectionPage-description.adoc |    2 +-
 .../DomainObjectIntrospectionPage.java             |    4 +-
 ...ObjectIntrospectionPage_annotationOptional.java |    9 +-
 ...ObjectIntrospectionPage_annotationRequired.java |    9 +-
 .../DomainObjectIntrospectionAnnotOptSeeding.java  |    2 +-
 .../jpa/DomainObjectIntrospectionAnnotOptJpa.java  |   16 +-
 ...mainObjectIntrospectionAnnotOptJpaEntities.java |    4 +-
 .../DomainObjectIntrospectionAnnotReqdSeeding.java |    2 +-
 .../jpa/DomainObjectIntrospectionAnnotReqdJpa.java |   22 +-
 ...ainObjectIntrospectionAnnotReqdJpaEntities.java |    4 +-
 ...mainObjectIntrospectionEncapsulatedSeeding.java |    2 +-
 .../DomainObjectIntrospectionEncapsulatedJpa.java  |   23 +-
 ...ObjectIntrospectionEncapsulatedJpaEntities.java |    4 +-
 ...ObjectIntrospectionVm_encapsulationEnabled.java |   12 +-
 .../mixinMethod/DomainObjectMixinMethod.java       |    4 +-
 .../DomainObjectMixinMethodPage-description.adoc   |    2 +-
 .../mixinMethod/DomainObjectMixinMethodPage.java   |    4 +-
 .../DomainObjectMixinMethodPage_objects.java       |    7 +-
 .../DomainObjectMixinMethodPage_updateName.java    |    7 +-
 .../DomainObjectMixinMethodSeeding.java            |    6 +-
 .../DomainObjectMixinMethod_initialCharacter.java  |    6 +-
 .../DomainObjectMixinMethod_updateName.java        |    4 +-
 .../jpa/DomainObjectMixinMethodJpa.java            |   20 +-
 .../jpa/DomainObjectMixinMethodJpaEntities.java    |    4 +-
 .../nature/DomainObjectNaturePage-description.adoc |    2 +-
 .../nature/DomainObjectNaturePage.java             |    4 +-
 .../nature/DomainObjectNaturePage_entities.java    |    9 +-
 .../nature/DomainObjectNaturePage_viewModels.java  |   11 +-
 .../nature/entity/DomainObjectNatureEntity.java    |    4 +-
 .../entity/DomainObjectNatureEntitySeeding.java    |    6 +-
 .../nature/entity/jpa/DomainObjectNatureJpa.java   |   22 +-
 .../entity/jpa/DomainObjectNatureJpaEntities.java  |    4 +-
 .../viewmodel/DomainObjectNatureViewModel.java     |   31 +-
 .../DomainObjectXxxDomainEventControlStrategy.java |    5 +-
 ...omainObjectXxxDomainEventControlSubscriber.java |    7 +-
 ...DomainObjectXxxDomainEventPage-description.adoc |    2 +-
 .../DomainObjectXxxDomainEventPage.java            |   30 +-
 ...ctXxxDomainEventPage_changeControlStrategy.java |    4 +-
 ...inObjectXxxDomainEventPage_controlStrategy.java |    4 +-
 ...bjectXxxDomainEventPage_updateTextViaMixin.java |    4 +-
 .../child/DomainObjectXxxDomainEventChildVm.java   |   18 +-
 .../DomainObjectLifecycleEventVm.java              |   11 +-
 .../DomainObjectXxxLifecycleEvent.java             |   16 +-
 ...ainObjectXxxLifecycleEventPage-description.adoc |    2 +-
 .../DomainObjectXxxLifecycleEventPage.java         |   22 +-
 ...ainObjectXxxLifecycleEventPage_clearEvents.java |    7 +-
 ...inObjectXxxLifecycleEventPage_createEntity.java |   16 +-
 ...inObjectXxxLifecycleEventPage_deleteEntity.java |    9 +-
 .../DomainObjectXxxLifecycleEventPage_events.java  |    4 +-
 ...inObjectXxxLifecycleEventPage_updateEntity.java |    9 +-
 .../DomainObjectXxxLifecycleEventSubscriber.java   |   13 +-
 .../jpa/DomainObjectXxxLifecycleEventJpa.java      |    5 +-
 .../DomainObjectXxxLifecycleEventJpaEntities.java  |    4 +-
 .../bookmarking/DomainObjectLayoutBookmarking.java |    8 +-
 .../DomainObjectLayoutBookmarkingChild.java        |    6 +-
 ...mainObjectLayoutBookmarkingChildRepository.java |    2 -
 .../DomainObjectLayoutBookmarkingNestedVm.java     |   21 +-
 ...ainObjectLayoutBookmarkingPage-description.adoc |    2 +-
 .../DomainObjectLayoutBookmarkingPage.java         |   11 +-
 .../DomainObjectLayoutBookmarkingPage_objects.java |    3 +-
 .../DomainObjectLayoutBookmarkingRepository.java   |    2 -
 .../DomainObjectLayoutBookmarkingSeeding.java      |    2 +-
 .../DomainObjectLayoutBookmarking_addChildren.java |    5 +-
 .../jpa/DomainObjectLayoutBookmarkingChildJpa.java |    5 +-
 ...mainObjectLayoutBookmarkingJpa-description.adoc |    2 +-
 .../jpa/DomainObjectLayoutBookmarkingJpa.java      |    7 +-
 .../DomainObjectLayoutBookmarkingJpaEntities.java  |    9 +-
 .../cssClass/DomainObjectLayoutCssClass.java       |    8 +-
 ...DomainObjectLayoutCssClassPage-description.adoc |    2 +-
 .../cssClass/DomainObjectLayoutCssClassPage.java   |    4 +-
 .../DomainObjectLayoutCssClassPage_objects.java    |    8 +-
 .../DomainObjectLayoutCssClassSeeding.java         |    6 +-
 .../jpa/DomainObjectLayoutCssClassJpa.java         |    5 +-
 .../jpa/DomainObjectLayoutCssClassJpaEntities.java |    8 +-
 .../cssClassFa/DomainObjectLayoutCssClassFa.java   |    4 +-
 ...mainObjectLayoutCssClassFaPage-description.adoc |    2 +-
 .../DomainObjectLayoutCssClassFaPage.java          |    5 +-
 .../DomainObjectLayoutCssClassFaPage_objects.java  |    8 +-
 .../DomainObjectLayoutCssClassFaSeeding.java       |    6 +-
 .../jpa/DomainObjectLayoutCssClassFaJpa.java       |   20 +-
 .../DomainObjectLayoutCssClassFaJpaEntities.java   |    8 +-
 .../describedAs/DomainObjectLayoutDescribedAs.java |    4 +-
 ...ainObjectLayoutDescribedAsPage-description.adoc |    2 +-
 .../DomainObjectLayoutDescribedAsPage.java         |    5 +-
 .../DomainObjectLayoutDescribedAsPage_objects.java |    8 +-
 .../DomainObjectLayoutDescribedAsSeeding.java      |    6 +-
 .../jpa/DomainObjectLayoutDescribedAsJpa.java      |   20 +-
 .../DomainObjectLayoutDescribedAsJpaEntities.java  |    8 +-
 .../named/DomainObjectLayoutNamed.java             |    4 +-
 .../DomainObjectLayoutNamedPage-description.adoc   |    2 +-
 .../named/DomainObjectLayoutNamedPage.java         |    4 +-
 .../named/DomainObjectLayoutNamedPage_objects.java |    8 +-
 .../named/DomainObjectLayoutNamedSeeding.java      |    6 +-
 .../named/jpa/DomainObjectLayoutNamedJpa.java      |   20 +-
 .../jpa/DomainObjectLayoutNamedJpaEntities.java    |    8 +-
 .../paged/DomainObjectLayoutPaged.java             |    4 +-
 .../DomainObjectLayoutPagedPage-description.adoc   |    4 +-
 .../paged/DomainObjectLayoutPagedPage.java         |   18 +-
 ...jectLayoutPagedPage_actionReturningObjects.java |    7 +-
 .../paged/DomainObjectLayoutPagedPage_objects.java |    8 +-
 .../paged/DomainObjectLayoutPagedSeeding.java      |    6 +-
 .../paged/jpa/DomainObjectLayoutPagedJpa.java      |   20 +-
 .../jpa/DomainObjectLayoutPagedJpaEntities.java    |    8 +-
 .../tabledec/DomainObjectLayoutTableDecorator.java |    6 +-
 ...ObjectLayoutTableDecoratorPage-description.adoc |    4 +-
 .../DomainObjectLayoutTableDecoratorPage.java      |   20 +-
 ...tTableDecoratorPage_actionReturningObjects.java |   13 +-
 ...mainObjectLayoutTableDecoratorPage_objects.java |    8 +-
 .../DomainObjectLayoutTableDecoratorSeeding.java   |    6 +-
 .../jpa/DomainObjectLayoutTableDecoratorJpa.java   |   20 +-
 ...omainObjectLayoutTableDecoratorJpaEntities.java |    8 +-
 .../xxxUiEvent/DomainObjectLayoutXxxUiEvent.java   |    6 +-
 ...mainObjectLayoutXxxUiEventPage-description.adoc |    2 +-
 .../DomainObjectLayoutXxxUiEventPage.java          |   15 +-
 .../DomainObjectLayoutXxxUiEventPage_objects.java  |    8 +-
 .../DomainObjectLayoutXxxUiEventSeeding.java       |    6 +-
 .../DomainObjectLayoutXxxUiEventSubscriber.java    |   11 +-
 .../jpa/DomainObjectLayoutXxxUiEventJpa.java       |   20 +-
 .../DomainObjectLayoutXxxUiEventJpaEntities.java   |    8 +-
 .../actions/assoc/assoc/AssociatedActionDemo.java  |    3 +-
 .../depargs/depargs/DependentArgsActionDemo.java   |    3 +-
 .../objects/embedded/embedded/EmbeddedTypeVm.java  |    8 +-
 .../embedded/embedded/jdo/ComplexNumberJdo.java    |    9 +-
 .../jdo/ComplexNumberJdoValueSemantics.java        |   10 +-
 .../embedded/embedded/jdo/NumberConstantJdo.java   |   21 +-
 .../embedded/jdo/NumberConstantJdoRepository.java  |    9 +-
 .../jdo/NumberConstantJdo_updateNumber.java        |    5 +-
 .../embedded/embedded/jpa/ComplexNumberJpa.java    |    2 +-
 .../jpa/ComplexNumberJpaValueSemantics.java        |   12 +-
 .../embedded/jpa/NumberConstantJpaRepository.java  |    9 +-
 .../jpa/NumberConstantJpa_updateNumber.java        |    5 +-
 .../embedded/persistence/NumberConstantEntity.java |    8 +-
 .../persistence/NumberConstantSeeding.java         |    8 +-
 .../embedded/samples/ComplexNumberSamples.java     |    6 +-
 .../mixins/mixins/CountHolder_explanation.java     |    4 +-
 .../mixins/CountHolder_fibonacciSequence.java      |    6 +-
 .../mixins/mixins/CountHolder_updateCount.java     |    4 +-
 .../progmodel/objects/mixins/mixins/MixinVm.java   |   15 +-
 .../domain/properties/Property/PropertyMenu.java   |   55 +-
 .../PropertyCommandPublishing-description.adoc     |    2 +-
 .../PropertyCommandPublishing.java                 |    6 +-
 .../PropertyCommandPublishingPage-description.adoc |    4 +-
 .../PropertyCommandPublishingPage.java             |    4 +-
 .../PropertyCommandPublishingPage_objects.java     |    7 +-
 .../PropertyCommandPublishingSeeding.java          |    6 +-
 ...ropertyCommandPublishing_publishedCommands.java |    4 +-
 .../jpa/PropertyCommandPublishingJpa.java          |    5 +-
 .../jpa/PropertyCommandPublishingJpaEntities.java  |    8 +-
 .../PropertyDomainEventControlSubscriber.java      |    2 -
 .../domainEvent/PropertyDomainEventPage.java       |   21 +-
 ...pertyDomainEventPage_changeControlStrategy.java |   10 +-
 .../PropertyDomainEventPage_controlStrategy.java   |    4 +-
 .../editing/EditingEnabledMetaAnnotation.java      |   40 -
 .../Property/editing/PropertyEditing.java}         |   10 +-
 .../PropertyEditing.layout.xml}                    |   13 +-
 .../editing/PropertyEditingPage-description.adoc   |   83 +-
 .../Property/editing/PropertyEditingPage.java      |   51 +-
 .../editing/PropertyEditingPage.layout.xml         |   13 +-
 .../editing/PropertyEditingPage_objects.java}      |   17 +-
 .../Property/editing/PropertyEditingSeeding.java}  |   14 +-
 .../jpa/PropertyEditingJpa-description.adoc}       |   34 +-
 .../Property/editing/jpa/PropertyEditingJpa.java}  |   53 +-
 .../editing/jpa/PropertyEditingJpaEntities.java}   |   16 +-
 .../EditingReasonDisabledMetaAnnotation.java       |   43 -
 ...pertyEditingReasonDisabledPage-description.adoc |    4 -
 .../PropertyEditingReasonDisabledPage.java         |   96 -
 .../PropertyEditingReasonDisabledPage.layout.xml   |   56 -
 .../PropertyExecutionPublishing-description.adoc   |    2 +-
 .../PropertyExecutionPublishing.java               |    6 +-
 ...ropertyExecutionPublishingPage-description.adoc |    4 +-
 .../PropertyExecutionPublishingPage.java           |    4 +-
 .../PropertyExecutionPublishingPage_objects.java   |    7 +-
 .../PropertyExecutionPublishingSeeding.java        |    6 +-
 ...rtyExecutionPublishing_publishedExecutions.java |    4 +-
 .../jpa/PropertyExecutionPublishingJpa.java        |    5 +-
 .../PropertyExecutionPublishingJpaEntities.java    |    8 +-
 .../fileAccept/FileAcceptPdfMetaAnnotation.java    |   42 -
 .../PropertyFileAcceptPage-description.adoc        |  100 +-
 .../fileAccept/PropertyFileAcceptPage.java         |   53 +-
 .../fileAccept/PropertyFileAcceptPage.layout.xml   |    8 +-
 ....java => PropertyFileAcceptPage_updatePdf.java} |   31 +-
 ....java => PropertyFileAcceptPage_updateTxt.java} |   31 +-
 ...rtyFileAcceptPage_updateWithMetaAnnotation.java |   58 -
 ...eptPage_updateWithMetaAnnotationOverridden.java |   62 -
 .../hidden/PropertyHidden-description.adoc         |   42 -
 .../properties/Property/hidden/PropertyHidden.java |   77 -
 .../hidden/PropertyHiddenPage-description.adoc     |   57 -
 .../Property/hidden/PropertyHiddenPage.java        |   52 -
 .../hidden/PropertyHiddenPage_objects.java         |   27 -
 .../Property/hidden/PropertyHiddenRepository.java  |   26 -
 .../Property/hidden/PropertyHiddenSeeding.java     |   40 -
 .../Property/hidden/jpa/PropertyHiddenJpa.java     |   91 -
 .../hidden/jpa/PropertyHiddenJpaEntities.java      |   55 -
 .../maxLength/MaxLength10MetaAnnotation.java       |   42 -
 .../PropertyMaxLengthPage-description.adoc         |   84 +-
 .../Property/maxLength/PropertyMaxLengthPage.java  |   41 +-
 .../maxLength/PropertyMaxLengthPage.layout.xml     |    7 +-
 ....java => PropertyMaxLengthPage_updateName.java} |   22 +-
 ...ertyMaxLengthPage_updateWithMetaAnnotation.java |   57 -
 ...gthPage_updateWithMetaAnnotationOverridden.java |   61 -
 .../MustSatisfyOfWorkingAgeMetaAnnotation.java     |   46 -
 .../mustSatisfy/OfRetirementAgeSpecification.java  |   32 -
 .../PropertyMustSatisfyPage-description.adoc       |  108 +-
 .../mustSatisfy/PropertyMustSatisfyPage.java       |   35 +-
 .../mustSatisfy/PropertyMustSatisfyPage.layout.xml |    7 +-
 ...PropertyMustSatisfyPage_updateCustomerAge.java} |   21 +-
 ...tyMustSatisfyPage_updateWithMetaAnnotation.java |   58 -
 ...sfyPage_updateWithMetaAnnotationOverridden.java |   61 -
 .../PropertyOptionalityPage-description.adoc       |   10 +-
 .../optionality/PropertyOptionalityPage.java       |    3 +-
 .../PropertyProjectingPage-description.adoc        |    4 +-
 .../projecting/PropertyProjectingPage.java         |    5 +-
 .../PropertyProjectingPage_returnsChildren.java    |    3 +-
 .../child/PropertyProjectingChildVm.java           |    7 +-
 .../projecting/jdo/PropertyProjectingChildJdo.java |    3 +-
 .../jdo/PropertyProjectingChildJdoEntities.java    |    2 +-
 .../projecting/jpa/PropertyProjectingChildJpa.java |    3 +-
 .../jpa/PropertyProjectingChildJpaEntities.java    |    2 +-
 .../PropertyRegexPatternPage-description.adoc      |   10 +-
 .../regexPattern/PropertyRegexPatternPage.java     |    3 +-
 .../snapshot/PropertySnapshotPage-description.adoc |    2 +-
 .../Property/snapshot/PropertySnapshotPage.java    |    3 +-
 .../PropertyLayout/PropertyLayoutMenu.java         |    5 +-
 .../PropertyLayoutCssClassPage-description.adoc    |   12 +-
 .../cssClass/PropertyLayoutCssClassPage.java       |    3 +-
 .../describedAs/PropertyLayoutDescribedAsPage.java |    3 +-
 .../hidden/PropertyLayoutHidden-description.adoc   |    2 +-
 .../PropertyLayoutHiddenPage-description.adoc      |    4 +-
 .../hidden/PropertyLayoutHiddenPage.java           |    7 +-
 .../hidden/PropertyLayoutHiddenPage_objects.java   |    7 +-
 .../hidden/PropertyLayoutHiddenSeeding.java        |    6 +-
 .../hidden/jpa/PropertyLayoutHiddenJpa.java        |    3 +-
 .../jpa/PropertyLayoutHiddenJpaEntities.java       |    8 +-
 ...ropertyLayoutLabelPositionPage-description.adoc |   28 +-
 .../PropertyLayoutLabelPositionPage.java           |    3 +-
 .../PropertyLayoutMultiLinePage-description.adoc   |   26 +-
 .../multiLine/PropertyLayoutMultiLinePage.java     |    3 +-
 .../named/PropertyLayoutNamedPage.java             |    3 +-
 .../navigable/FileNodeVm-description.adoc          |    6 +-
 .../PropertyLayout/navigable/FileNodeVm.java       |    3 +-
 .../PropertyLayoutRenderDayPage-description.adoc   |   16 +-
 .../renderDay/PropertyLayoutRenderDayPage.java     |    3 +-
 .../PropertyLayoutRepaintingPage-description.adoc  |   10 +-
 .../repainting/PropertyLayoutRepaintingPage.java   |    3 +-
 ...ropertyLayoutTypicalLengthPage-description.adoc |   16 +-
 .../PropertyLayoutTypicalLengthPage.java           |    3 +-
 .../java/demoapp/dom/featured/FeaturedMenu.java    |    5 +-
 .../customui/geocoding/GeoapifyClient.java         |    3 +-
 .../dom/featured/customui/vm/BoundingBox.java      |    3 +-
 .../featured/customui/vm/WhereInTheWorldVm.java    |    5 +-
 .../featured/layout/describedAs/DescribedAsVm.java |    5 +-
 .../layout/describedAs/DescribedAsVm.layout.xml    |    2 +-
 .../demoapp/dom/featured/layout/tabs/TabDemo.java  |    3 +-
 .../dom/featured/layout/tabs/TabDemo.layout.xml    |    2 +-
 .../demoapp/dom/homepage/DemoHomePage.layout.xml   |    2 +-
 .../src/main/java/demoapp/dom/menubars.layout.xml  |    3 -
 .../demoapp/dom/services/core/ServicesMenu.java    |    5 +-
 .../EventBusServiceDemoVm.layout.xml               |    2 +-
 .../core/eventbusservice/EventLogEntryJdo.java     |    3 +-
 .../EventLogEntryJdoRepository.java                |    3 +-
 .../core/eventbusservice/EventLogEntryJpa.java     |    3 +-
 .../EventLogEntryJpaRepository.java                |    3 +-
 .../eventbusservice/EventLogEntryRepository.java   |    3 +-
 .../EventSubscriberDemoImplementation.java         |    7 +-
 .../messageservice/MessageServiceDemoVm.layout.xml |    2 +-
 .../core/wrapperFactory/jdo/WrapperFactoryJdo.java |    5 +-
 .../core/wrapperFactory/jpa/WrapperFactoryJpa.java |    5 +-
 .../XmlSnapshotParentVm-description.adoc           |    2 +-
 .../xmlSnapshotService/XmlSnapshotParentVm.java    |    7 +-
 .../child/XmlSnapshotChildVm.java                  |    3 +-
 .../core/xmlSnapshotService/class-diagram.svg      |    5 +-
 .../xmlSnapshotService/peer/XmlSnapshotPeerVm.java |    5 +-
 .../peer/child/XmlSnapshotPeerChildVm.java         |    3 +-
 .../ApplicationTenancyEvaluatorForDemo.java        |    3 +-
 .../secman/apptenancy/jdo/TenantedJdo.java         |    3 +-
 .../secman/apptenancy/jpa/TenantedJpa.java         |    3 +-
 .../secman/apptenancy/jpa/TenantedJpaEntities.java |    2 +-
 ...usewayBlobHolder_actionReturningCollection.java |    3 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../types/causeway/blobs/jdo/CausewayBlobJdo.java  |    3 +-
 .../types/causeway/blobs/jpa/CausewayBlobJpa.java  |    3 +-
 .../blobs/samples/CausewayBlobsSamples.java        |    3 +-
 .../types/causeway/blobs/vm/CausewayBlobVm.java    |    5 +-
 ...usewayClobHolder_actionReturningCollection.java |    3 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../types/causeway/clobs/jdo/CausewayClobJdo.java  |    3 +-
 .../types/causeway/clobs/jpa/CausewayClobJpa.java  |    3 +-
 .../clobs/samples/CausewayClobsSamples.java        |    3 +-
 .../types/causeway/clobs/vm/CausewayClobVm.java    |    5 +-
 ...sourcePathHolder_actionReturningCollection.java |    3 +-
 ...thHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/CausewayLocalResourcePathJdo.java          |    3 +-
 .../jpa/CausewayLocalResourcePathJpa.java          |    3 +-
 .../vm/CausewayLocalResourcePathVm.java            |    5 +-
 ...ewayMarkupHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...upHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...ayPasswordHolder_actionReturningCollection.java |    3 +-
 ...rdHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../passwords/jdo/CausewayPasswordJdo.java         |    3 +-
 .../passwords/jdo/CausewayPasswordJdoEntities.java |    2 +-
 .../passwords/jpa/CausewayPasswordJpa.java         |    3 +-
 .../passwords/jpa/CausewayPasswordJpaEntities.java |    2 +-
 .../persistence/CausewayPasswordSeeding.java       |    2 +-
 .../causeway/passwords/vm/CausewayPasswordVm.java  |    5 +-
 ...endarEventHolder_actionReturningCollection.java |    3 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../cal/jdo/CausewayCalendarEventEntities.java     |    2 +-
 .../cal/jdo/CausewayCalendarEventJdo.java          |    3 +-
 .../cal/jpa/CausewayCalendarEventEntities.java     |    2 +-
 .../cal/jpa/CausewayCalendarEventJpa.java          |    3 +-
 .../cal/vm/CausewayCalendarEventVm.java            |    5 +-
 .../dom/types/causewayext/sse/AsyncActionDemo.java |    3 +-
 ...ayAsciiDocHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...ocHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...ayMarkdownHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...wnHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...usewayVegaHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...gaHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...feredImageHolder_actionReturningCollection.java |    3 +-
 ...geHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../images/jdo/JavaAwtBufferedImageJdo.java        |    3 +-
 .../images/jpa/JavaAwtBufferedImageJpa.java        |    3 +-
 .../persistence/JavaAwtBufferedImageSeeding.java   |    2 +-
 .../samples/JavaAwtBufferedImagesSamples.java      |    3 +-
 .../javaawt/images/vm/JavaAwtBufferedImageVm.java  |    3 +-
 ...perBooleanHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...anHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...rapperByteHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...rCharacterHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...pperDoubleHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...leHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...vaLangEnumHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...umHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...apperFloatHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...atHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...perIntegerHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...rapperLongHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...apperShortHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...LangStringHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...BigDecimalHolder_actionReturningCollection.java |    3 +-
 ...alHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../bigdecimals/jdo/JavaMathBigDecimalJdo.java     |    3 +-
 .../jdo/JavaMathBigDecimalJdoEntities.java         |    2 +-
 .../bigdecimals/jpa/JavaMathBigDecimalJpa.java     |    3 +-
 .../jpa/JavaMathBigDecimalJpaEntities.java         |    2 +-
 .../bigdecimals/vm/JavaMathBigDecimalVm.java       |    5 +-
 ...BigIntegerHolder_actionReturningCollection.java |    3 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../bigintegers/jdo/JavaMathBigIntegerJdo.java     |    3 +-
 .../jdo/JavaMathBigIntegerJdoEntities.java         |    2 +-
 .../bigintegers/jpa/JavaMathBigIntegerJpa.java     |    3 +-
 .../jpa/JavaMathBigIntegerJpaEntities.java         |    2 +-
 .../bigintegers/vm/JavaMathBigIntegerVm.java       |    5 +-
 ...JavaNetUrlHolder_actionReturningCollection.java |    3 +-
 ...rlHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../dom/types/javanet/urls/jdo/JavaNetUrlJdo.java  |    3 +-
 .../javanet/urls/jdo/JavaNetUrlJdoEntities.java    |    2 +-
 .../dom/types/javanet/urls/jpa/JavaNetUrlJpa.java  |    3 +-
 .../javanet/urls/jpa/JavaNetUrlJpaEntities.java    |    2 +-
 .../javanet/urls/samples/JavaNetUrlSamples.java    |    3 +-
 .../dom/types/javanet/urls/vm/JavaNetUrlVm.java    |    5 +-
 ...avaSqlDateHolder_actionReturningCollection.java |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../javasql/javasqldate/jdo/JavaSqlDateJdo.java    |    3 +-
 .../javasqldate/jdo/JavaSqlDateJdoEntities.java    |    2 +-
 .../javasql/javasqldate/jpa/JavaSqlDateJpa.java    |    3 +-
 .../javasqldate/jpa/JavaSqlDateJpaEntities.java    |    2 +-
 .../javasql/javasqldate/vm/JavaSqlDateVm.java      |    5 +-
 ...lTimestampHolder_actionReturningCollection.java |    3 +-
 ...mpHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../javasqltimestamp/jdo/JavaSqlTimestampJdo.java  |    3 +-
 .../jdo/JavaSqlTimestampJdoEntities.java           |    2 +-
 .../javasqltimestamp/jpa/JavaSqlTimestampJpa.java  |    3 +-
 .../jpa/JavaSqlTimestampJpaEntities.java           |    2 +-
 .../javasqltimestamp/vm/JavaSqlTimestampVm.java    |    5 +-
 ...eLocalDateHolder_actionReturningCollection.java |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeLocalDateJdo.java                  |    3 +-
 .../jdo/JavaTimeLocalDateJdoEntities.java          |    2 +-
 .../jpa/JavaTimeLocalDateJpa.java                  |    3 +-
 .../jpa/JavaTimeLocalDateJpaEntities.java          |    2 +-
 .../javatimelocaldate/vm/JavaTimeLocalDateVm.java  |    5 +-
 ...alDateTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeLocalDateTimeJdo.java              |    3 +-
 .../jdo/JavaTimeLocalDateTimeJdoEntities.java      |    2 +-
 .../jpa/JavaTimeLocalDateTimeJpa.java              |    3 +-
 .../jpa/JavaTimeLocalDateTimeJpaEntities.java      |    2 +-
 .../vm/JavaTimeLocalDateTimeVm.java                |    5 +-
 ...eLocalTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeLocalTimeJdo.java                  |    3 +-
 .../jdo/JavaTimeLocalTimeJdoEntities.java          |    2 +-
 .../jpa/JavaTimeLocalTimeJpa.java                  |    3 +-
 .../jpa/JavaTimeLocalTimeJpaEntities.java          |    2 +-
 .../javatimelocaltime/vm/JavaTimeLocalTimeVm.java  |    5 +-
 ...etDateTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeOffsetDateTimeJdo.java             |    3 +-
 .../jdo/JavaTimeOffsetDateTimeJdoEntities.java     |    2 +-
 .../jpa/JavaTimeOffsetDateTimeJpa.java             |    3 +-
 .../jpa/JavaTimeOffsetDateTimeJpaEntities.java     |    2 +-
 .../vm/JavaTimeOffsetDateTimeVm.java               |    5 +-
 ...OffsetTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeOffsetTimeJdo.java                 |    3 +-
 .../jdo/JavaTimeOffsetTimeJdoEntities.java         |    2 +-
 .../jpa/JavaTimeOffsetTimeJpa.java                 |    3 +-
 .../jpa/JavaTimeOffsetTimeJpaEntities.java         |    2 +-
 .../vm/JavaTimeOffsetTimeVm.java                   |    5 +-
 ...edDateTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JavaTimeZonedDateTimeJdo.java              |    3 +-
 .../jdo/JavaTimeZonedDateTimeJdoEntities.java      |    2 +-
 .../jpa/JavaTimeZonedDateTimeJpa.java              |    3 +-
 .../jpa/JavaTimeZonedDateTimeJpaEntities.java      |    2 +-
 .../vm/JavaTimeZonedDateTimeVm.java                |    5 +-
 ...vaUtilDateHolder_actionReturningCollection.java |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../javautil/javautildate/jdo/JavaUtilDateJdo.java |    3 +-
 .../javautildate/jdo/JavaUtilDateJdoEntities.java  |    2 +-
 .../javautil/javautildate/jpa/JavaUtilDateJpa.java |    3 +-
 .../javautildate/jpa/JavaUtilDateJpaEntities.java  |    2 +-
 .../javautil/javautildate/vm/JavaUtilDateVm.java   |    5 +-
 ...vaUtilUuidHolder_actionReturningCollection.java |    3 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |    3 +-
 ...idHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 ...daDateTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jodatime/jodadatetime/jdo/JodaDateTimeJdo.java |    3 +-
 .../jodadatetime/jdo/JodaDateTimeJdoEntities.java  |    2 +-
 .../jodadatetime/samples/JodaDateTimeSamples.java  |    1 +
 .../jodatime/jodadatetime/vm/JodaDateTimeVm.java   |    5 +-
 .../jodatime/jodalocaldate/JodaLocalDates.java     |    1 +
 ...aLocalDateHolder_actionReturningCollection.java |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jodalocaldate/jdo/JodaLocalDateJdo.java        |    3 +-
 .../jdo/JodaLocalDateJdoEntities.java              |    2 +-
 .../samples/JodaLocalDateSamples.java              |    1 +
 .../jodatime/jodalocaldate/vm/JodaLocalDateVm.java |    5 +-
 .../jodalocaldatetime/JodaLocalDateTimes.java      |    1 +
 ...alDateTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jdo/JodaLocalDateTimeJdo.java                  |    3 +-
 .../jdo/JodaLocalDateTimeJdoEntities.java          |    2 +-
 .../samples/JodaLocalDateTimeSamples.java          |    1 +
 .../jodalocaldatetime/vm/JodaLocalDateTimeVm.java  |    5 +-
 .../jodatime/jodalocaltime/JodaLocalTimes.java     |    1 +
 ...aLocalTimeHolder_actionReturningCollection.java |    3 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../jodalocaltime/jdo/JodaLocalTimeJdo.java        |    5 +-
 .../jdo/JodaLocalTimeJdoEntities.java              |    2 +-
 .../samples/JodaLocalTimeSamples.java              |    1 +
 .../jodatime/jodalocaltime/vm/JodaLocalTimeVm.java |    5 +-
 ...rimitiveBooleanHolder_actionReturningArray.java |    3 +-
 ...anHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../booleans/jdo/PrimitiveBooleanJdo.java          |    2 +-
 .../booleans/jpa/PrimitiveBooleanJpa.java          |    2 +-
 .../primitive/booleans/vm/PrimitiveBooleanVm.java  |    2 +-
 .../PrimitiveByteHolder_actionReturningArray.java  |    3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/bytes/jdo/PrimitiveByteJdo.java      |    2 +-
 .../primitive/bytes/jpa/PrimitiveByteJpa.java      |    2 +-
 .../types/primitive/bytes/vm/PrimitiveByteVm.java  |    2 +-
 .../PrimitiveCharHolder_actionReturningArray.java  |    3 +-
 ...arHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/chars/jdo/PrimitiveCharJdo.java      |    2 +-
 .../primitive/chars/jpa/PrimitiveCharJpa.java      |    2 +-
 .../types/primitive/chars/vm/PrimitiveCharVm.java  |    2 +-
 ...PrimitiveDoubleHolder_actionReturningArray.java |    3 +-
 ...leHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/doubles/jdo/PrimitiveDoubleJdo.java  |    2 +-
 .../primitive/doubles/jpa/PrimitiveDoubleJpa.java  |    2 +-
 .../primitive/doubles/vm/PrimitiveDoubleVm.java    |    2 +-
 .../PrimitiveFloatHolder_actionReturningArray.java |    3 +-
 ...atHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/floats/jdo/PrimitiveFloatJdo.java    |    2 +-
 .../primitive/floats/jpa/PrimitiveFloatJpa.java    |    2 +-
 .../primitive/floats/vm/PrimitiveFloatVm.java      |    2 +-
 .../PrimitiveIntHolder_actionReturningArray.java   |    3 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../types/primitive/ints/jdo/PrimitiveIntJdo.java  |    2 +-
 .../types/primitive/ints/jpa/PrimitiveIntJpa.java  |    2 +-
 .../types/primitive/ints/vm/PrimitiveIntVm.java    |    2 +-
 .../PrimitiveLongHolder_actionReturningArray.java  |    3 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/longs/jdo/PrimitiveLongJdo.java      |    2 +-
 .../primitive/longs/jpa/PrimitiveLongJpa.java      |    2 +-
 .../types/primitive/longs/vm/PrimitiveLongVm.java  |    2 +-
 .../PrimitiveShortHolder_actionReturningArray.java |    3 +-
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |    3 +-
 .../primitive/shorts/jdo/PrimitiveShortJdo.java    |    2 +-
 .../primitive/shorts/jpa/PrimitiveShortJpa.java    |    2 +-
 .../primitive/shorts/vm/PrimitiveShortVm.java      |    2 +-
 .../src/main/resources/static/css/application.css  |   20 +
 .../src/main/resources/static/images/gift.svg      |    4 +-
 .../resources/ResourceReaderService_Test.java      |    6 +-
 .../customvaluetypes/ComplexNumberJdo_Test.java    |    3 +-
 .../customui/GeocodeResponseUtilsTest.java         |    3 +-
 .../geocoding/GeoapifyClientTest_geocode.java      |    3 +-
 .../java/demoapp/web/DemoAppManifestCommon.java    |    5 +-
 .../common/ui/custom/WhereInTheWorldPanel.java     |    5 +-
 .../ui/custom/WhereInTheWorldPanelFactory.java     |    1 -
 .../webapp/wicket/jdo/DemoAppWicketJdo.java        |    2 +-
 .../webapp/wicket/jpa/DemoAppWicketJpa.java        |    5 +-
 ...hPdfJsViewer_IntegTest.dump_facets.approved.xml |   84 +-
 ..._MixinDomain_IntegTest.dump_facets.approved.xml |   84 +-
 ...hPdfjsViewer_IntegTest.dump_facets.approved.xml |   67 +-
 ...r_PropDomain_IntegTest.dump_facets.approved.xml |   67 +-
 .../causeway/client/kroviz/utils/js/AsciiDoctor.kt |   11 +-
 pom.xml                                            |   24 +
 .../MetaModelRegressionTest.verify.approved.xml    | 2462 ++++++++++++--------
 serve-timeline.sh                                  |    6 +-
 starters/pom.xml                                   |    6 +-
 supplemental-model/pom.xml                         |    2 +-
 tooling/pom.xml                                    |    4 +-
 viewers/restfulobjects/applib/pom.xml              |    5 +-
 viewers/restfulobjects/viewer/pom.xml              |    5 +-
 viewers/wicket/applib/pom.xml                      |    2 +
 viewers/wicket/ui/pom.xml                          |   10 +-
 viewers/wicket/viewer/pom.xml                      |    6 +-
 868 files changed, 9626 insertions(+), 11220 deletions(-)

diff --cc .run/DemoAppWicketJpa.run.xml
index 68ded5bbec,68ded5bbec..73dc4a6054
--- a/.run/DemoAppWicketJpa.run.xml
+++ b/.run/DemoAppWicketJpa.run.xml
@@@ -1,9 -1,9 +1,10 @@@
  <component name="ProjectRunConfigurationManager">
    <configuration default="false" name="DemoAppWicketJpa" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
++    <option name="ALTERNATIVE_JRE_PATH" value="17" />
++    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
      <module name="demo-wicket-jpa" />
--    <option name="SPRING_BOOT_MAIN_CLASS" value="demoapp.webapp.wicket.jpa.DemoAppWicketJpa" />
--    <option name="ALTERNATIVE_JRE_PATH" />
      <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
++    <option name="SPRING_BOOT_MAIN_CLASS" value="demoapp.webapp.wicket.jpa.DemoAppWicketJpa" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
diff --cc bom/pom.xml
index 47928c0e61,dd70f8dae5..e38edcd10d
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -1478,7 -1478,7 +1478,7 @@@ It is therefore a copy of org.apache:ap
  			<dependency>
  				<groupId>com.fasterxml.woodstox</groupId>
  				<artifactId>woodstox-core</artifactId>
- 				<version>6.5.0</version>
 -				<version>6.5.1</version>
++                <version>6.5.1</version>
  			</dependency>
  			<dependency>
  				<groupId>org.codehaus.woodstox</groupId>
@@@ -2263,11 -2263,11 +2263,13 @@@
                      <artifactId>maven-compiler-plugin</artifactId>
                      <version>${maven-compiler-plugin.version}</version>
                      <configuration>
--						<showDeprecation>true</showDeprecation>
--						<showWarnings>true</showWarnings>
--						<parameters>true</parameters>
--						<!-- Java compliance level, to be overridden with option maven.compiler.release -->
--					</configuration>
++                        <showDeprecation>true</showDeprecation>
++                        <showWarnings>true</showWarnings>
++                        <parameters>true</parameters>
++                        <!-- Java compliance level, to be overridden with option maven.compiler.release -->
++                        <source>17</source>
++                        <target>17</target>
++                    </configuration>
  					<!-- goal:compile binds to phase:compile -->
  					<!-- goal:testCompile binds to phase:test-compile -->
                  </plugin>
diff --cc examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 781ed767b8,39edc50d27..30c1719d8b
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@@ -18,8 -18,6 +18,8 @@@
   */
  package demoapp.webapp.wicket.jpa;
  
 +import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
- import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
++
  import org.springframework.boot.SpringApplication;
  import org.springframework.boot.autoconfigure.SpringBootApplication;
  import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@@ -71,9 -70,6 +72,9 @@@ import demoapp.webapp.wicket.common.ui.
      // Custom Demo UI (Wicket Viewer)
      DemoAppWicketCommon.class,
  
-     // bypassing sycurity for kroviz development
++    // bypassing security for kroviz development
 +    CausewayModuleSecurityBypass.class,
 +
      // Persistence/Converters (JPA)
      CausewayModuleValAsciidocPersistenceJpa.class,
      CausewayModuleValMarkdownPersistenceJpa.class,
diff --cc viewers/restfulobjects/applib/pom.xml
index ae173eaedd,ae173eaedd..f1ce358490
--- a/viewers/restfulobjects/applib/pom.xml
+++ b/viewers/restfulobjects/applib/pom.xml
@@@ -30,8 -30,8 +30,11 @@@
  	<name>Apache Causeway Viewer - RO (AppLib)</name>
  
      <properties>
--        <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.applib</jar-plugin.automaticModuleName>
++        <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.applib
++        </jar-plugin.automaticModuleName>
          <git-plugin.propertiesDir>org/apache/causeway/viewer/restfulobjects/applib</git-plugin.propertiesDir>
++        <maven.compiler.source>17</maven.compiler.source>
++        <maven.compiler.target>17</maven.compiler.target>
      </properties>
  
      <dependencies>
diff --cc viewers/restfulobjects/viewer/pom.xml
index 49c211c00f,49c211c00f..fa1c967f4e
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@@ -31,8 -31,8 +31,11 @@@
  	<name>Apache Causeway Viewer - RO (Viewer)</name>
  
      <properties>
--        <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.viewer</jar-plugin.automaticModuleName>
++        <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.viewer
++        </jar-plugin.automaticModuleName>
          <git-plugin.propertiesDir>org/apache/causeway/viewer/restfulobjects/viewer</git-plugin.propertiesDir>
++        <maven.compiler.source>17</maven.compiler.source>
++        <maven.compiler.target>17</maven.compiler.target>
      </properties>
  
      <dependencies>
diff --cc viewers/wicket/applib/pom.xml
index 17f2c5de07,17f2c5de07..cfddab1705
--- a/viewers/wicket/applib/pom.xml
+++ b/viewers/wicket/applib/pom.xml
@@@ -33,6 -33,6 +33,8 @@@
      <properties>
          <jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.applib</jar-plugin.automaticModuleName>
          <git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/applib</git-plugin.propertiesDir>
++        <maven.compiler.source>17</maven.compiler.source>
++        <maven.compiler.target>17</maven.compiler.target>
      </properties>
  
      <dependencies>
diff --cc viewers/wicket/ui/pom.xml
index 227f4db264,227f4db264..4b5ff064f8
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@@ -24,10 -24,10 +24,12 @@@
  	<artifactId>causeway-viewer-wicket-ui</artifactId>
  	<name>Apache Causeway Viewer - Wicket (UI Components)</name>
  
--	<properties>
--		<jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.ui</jar-plugin.automaticModuleName>
--		<git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/ui</git-plugin.propertiesDir>
--	</properties>
++    <properties>
++        <jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.ui</jar-plugin.automaticModuleName>
++        <git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/ui</git-plugin.propertiesDir>
++        <maven.compiler.source>17</maven.compiler.source>
++        <maven.compiler.target>17</maven.compiler.target>
++    </properties>
  
  	<build>
  		<resources>
diff --cc viewers/wicket/viewer/pom.xml
index 97cf311bb3,97cf311bb3..e66e6878c1
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@@ -34,8 -34,8 +34,10 @@@
      <properties>
          <jar-plugin.automaticModuleName>org.apache.causeway.viewer.wicket.viewer</jar-plugin.automaticModuleName>
          <git-plugin.propertiesDir>org/apache/causeway/viewer/wicket/viewer</git-plugin.propertiesDir>
--		<!-- override surefire defaults from bom, as this is not a Java module yet -->
--		<surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
++        <!-- override surefire defaults from bom, as this is not a Java module yet -->
++        <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
++        <maven.compiler.source>17</maven.compiler.source>
++        <maven.compiler.target>17</maven.compiler.target>
      </properties>
  
      <build>


[causeway] 05/06: Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit fe10fba40fca8acba9aca5f9050f49c7e6d5c742
Merge: e105ed21a4 366d7664ef
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Wed Apr 26 14:33:12 2023 +0200

    Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264

 core/runtime/pom.xml                               | 33 ------------
 core/runtimeservices/pom.xml                       | 62 +++++++++++++++++++---
 .../factory/FactoryServiceDefault.java             |  3 +-
 .../dom/_infra/values/ValueHolderRepository.java   | 13 +++--
 .../DomainObjectXxxLifecycleEvent.java             |  1 -
 ...ainObjectXxxLifecycleEventPage-description.adoc |  2 +-
 .../java/demoapp/web/DemoAppManifestCommon.java    |  7 +--
 7 files changed, 70 insertions(+), 51 deletions(-)


[causeway] 04/06: Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit e105ed21a4f7d9715cd4a1d6838aaf37bb76592d
Merge: 3c448fa39e 0ba8d468ad
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Wed Apr 26 08:36:05 2023 +0200

    Merge branch 'spring6' of github.com:apache/causeway into CAUSEWAY-3264

 bom/pom.xml                                                        | 4 ++--
 core/runtimeservices/pom.xml                                       | 7 +++++++
 extensions/vw/pdfjs/wicket/integration/pom.xml                     | 2 +-
 .../causeway/extensions/pdfjs/wkt/integration/PdfJsVersion.java    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)



[causeway] 01/06: CAUSEWAY-3264 vega 1/n, asciidoctor

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch CAUSEWAY-3264
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit b2f92ac1eff8419b87545c5d74c8859ee1d7397b
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Mon Apr 24 16:45:06 2023 +0200

    CAUSEWAY-3264 vega 1/n, asciidoctor
---
 examples/demo/.run/DemoAppWicketJdo.run.xml        |   2 -
 examples/demo/wicket/jpa/pom.xml                   |  16 ++
 .../webapp/wicket/jpa/DemoAppWicketJpa.java        |   4 +
 incubator/clients/kroviz/build.gradle.kts          |   7 +-
 incubator/clients/kroviz/gradle.properties         |   2 +-
 .../apache/causeway/client/kroviz/to/TypeMapper.kt |   5 +-
 .../client/kroviz/ui/builder/FieldSetBuilder.kt    |   4 +-
 .../client/kroviz/ui/core/FormPanelFactory.kt      |  19 +-
 .../causeway/client/kroviz/ui/core/RoMenuBar.kt    |  10 +-
 .../causeway/client/kroviz/ui/dialog/VegaSample.kt | 233 +++++++++++++++++++++
 .../utils/js/{ShowDown.kt => AsciiDoctor.kt}       |  12 +-
 .../kroviz/utils/js/{ShowDown.kt => Vega.kt}       |  18 +-
 .../causeway/client/kroviz/snapshots/sample.json   | 150 ++-----------
 13 files changed, 312 insertions(+), 170 deletions(-)

diff --git a/examples/demo/.run/DemoAppWicketJdo.run.xml b/examples/demo/.run/DemoAppWicketJdo.run.xml
index 512a010222..631b102e2a 100644
--- a/examples/demo/.run/DemoAppWicketJdo.run.xml
+++ b/examples/demo/.run/DemoAppWicketJdo.run.xml
@@ -1,7 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DemoAppWicketJdo" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" />
-    <module name="demo-wicket-jdo" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="demoapp.webapp.wicket.jdo.DemoAppWicketJdo" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/examples/demo/wicket/jpa/pom.xml b/examples/demo/wicket/jpa/pom.xml
index 7e38ccefc3..f1d2a3e3e5 100644
--- a/examples/demo/wicket/jpa/pom.xml
+++ b/examples/demo/wicket/jpa/pom.xml
@@ -49,6 +49,22 @@
 			<groupId>org.apache.causeway.persistence</groupId>
 			<artifactId>causeway-persistence-jpa-eclipselink</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.causeway.security</groupId>
+            <artifactId>causeway-security-bypass</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.causeway.viewer</groupId>
+            <artifactId>causeway-viewer-wicket-applib</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
 
 	</dependencies>
 
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index f6e5f89113..781ed767b8 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -18,6 +18,7 @@
  */
 package demoapp.webapp.wicket.jpa;
 
+import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -70,6 +71,9 @@ import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
     // Custom Demo UI (Wicket Viewer)
     DemoAppWicketCommon.class,
 
+    // bypassing sycurity for kroviz development
+    CausewayModuleSecurityBypass.class,
+
     // Persistence/Converters (JPA)
     CausewayModuleValAsciidocPersistenceJpa.class,
     CausewayModuleValMarkdownPersistenceJpa.class,
diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts
index f5fdc8887c..74e83adc47 100644
--- a/incubator/clients/kroviz/build.gradle.kts
+++ b/incubator/clients/kroviz/build.gradle.kts
@@ -107,10 +107,11 @@ kotlin {
         implementation(npm("xml-beautify", "1.1.2", false))
         implementation(npm("xterm", "4.15.0", false))
         implementation(npm("pdfjs", "2.4.7", false))
-        implementation(npm("vega", "5.22.1", false))
-//        implementation(npm("vega-lite", "5.6.0", true))
+        implementation(npm("vega", "5.24.0"))
+//        implementation(npm("vega-lite", "5.6.0", false))
+//        implementation(npm("vega-embed", "6.21.3", false))
         implementation(npm("element-resize-event", "3.0.6", false))
-        implementation(npm("showdown", "2.1.0", false))
+        implementation(npm("asciidoctor", "2.2.6", false))
     }
     sourceSets["test"].dependencies {
         implementation(kotlin("test-js"))
diff --git a/incubator/clients/kroviz/gradle.properties b/incubator/clients/kroviz/gradle.properties
index 90baeeb9e3..59db1900d5 100644
--- a/incubator/clients/kroviz/gradle.properties
+++ b/incubator/clients/kroviz/gradle.properties
@@ -18,7 +18,7 @@
 #
 javaVersion=1.8
 #Plugins
-systemProp.kotlinVersion=1.7.0
+systemProp.kotlinVersion=1.8.0
 serializationVersion=1.3.3
 #Dependencies
 systemProp.kvisionVersion=5.15.3
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
index 21f93b7633..29523671ac 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
@@ -37,7 +37,7 @@ enum class ValueType(val type: String) {
     SHELL("Shell"),
     SVG_MAPPED("Map"),
     SVG_INLINE("Inline"),
-    VEGA("Vega"),
+    CANVAS("Canvas"),
 }
 
 class TypeMapper {
@@ -68,6 +68,7 @@ class TypeMapper {
             XmlHelper.isXml(contentStr) -> ValueType.HTML.type
             contentStr.startsWith(":Notice:") -> ValueType.HTML.type
             contentStr.startsWith("link:") -> ValueType.HTML.type
+            contentStr.contains("vega.github.io/schema") -> ValueType.CANVAS.type
             else -> ValueType.TEXT.type
         }
     }
@@ -89,7 +90,7 @@ class TypeMapper {
             ValueType.SLIDER.type -> return ValueType.SLIDER
             ValueType.SVG_MAPPED.type -> return ValueType.SVG_MAPPED
             ValueType.SVG_INLINE.type -> return ValueType.SVG_INLINE
-            ValueType.VEGA.type -> return ValueType.VEGA
+            ValueType.CANVAS.type -> return ValueType.CANVAS
             else -> {
                 return ValueType.TEXT
             }
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
index d1d5f34ecc..46fb3292f6 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
@@ -25,7 +25,7 @@ import org.apache.causeway.client.kroviz.to.ValueType
 import org.apache.causeway.client.kroviz.to.bs.FieldSetBs
 import org.apache.causeway.client.kroviz.ui.core.FormItem
 import org.apache.causeway.client.kroviz.ui.core.FormPanelFactory
-import org.apache.causeway.client.kroviz.utils.js.ShowDown
+import org.apache.causeway.client.kroviz.utils.js.AsciiDoctor
 
 class FieldSetBuilder {
 
@@ -47,7 +47,7 @@ class FieldSetBuilder {
                 label = p.named
                 if (memberType == ValueType.HTML && content is String) {
                     when {
-                        content.startsWith(":Notice:") -> content = ShowDown.convertMarkDown2Html(content)
+                        content.startsWith(":Notice:") -> content = AsciiDoctor.convert(content)
                         content.startsWith("link:") -> content = content.replace("link:", "")
                         else -> {}
                     }
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
index d5ab217f30..8ac0c2ba6e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
@@ -32,10 +32,7 @@ import io.kvision.form.text.Text
 import io.kvision.form.text.TextArea
 import io.kvision.form.time.DateTime
 import io.kvision.form.time.dateTime
-import io.kvision.html.Button
-import io.kvision.html.Div
-import io.kvision.html.Iframe
-import io.kvision.html.Image
+import io.kvision.html.*
 import io.kvision.panel.VPanel
 import io.kvision.panel.vPanel
 import io.kvision.utils.auto
@@ -74,8 +71,8 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
                     ValueType.SVG_INLINE -> add(createInline(fi))
                     ValueType.SVG_MAPPED -> add(createSvgMap(fi))
                     ValueType.BUTTON -> add(createButton(fi))
-                    ValueType.VEGA -> {
-                        TODO("implement VEGA")
+                    ValueType.CANVAS -> add(createCanvas(fi))
+                    else -> {
                     }
                 }
             }
@@ -245,6 +242,16 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
         return item
     }
 
+    private fun createCanvas(fi: FormItem): VPanel {
+        val item = VPanel {
+            val vega = fi.content as String
+            val canvas = Canvas()
+
+            add(canvas)
+        }
+        return item
+    }
+
     companion object {
         private const val FORM_PANEL = "form-panel"
     }
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
index 569d385c6c..3d66beb18a 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
@@ -35,10 +35,7 @@ import org.apache.causeway.client.kroviz.core.Session
 import org.apache.causeway.client.kroviz.core.aggregator.ActionDispatcher
 import org.apache.causeway.client.kroviz.core.event.ResourceProxy
 import org.apache.causeway.client.kroviz.to.mb.Menubars
-import org.apache.causeway.client.kroviz.ui.dialog.About
-import org.apache.causeway.client.kroviz.ui.dialog.EventDialog
-import org.apache.causeway.client.kroviz.ui.dialog.LoginPrompt
-import org.apache.causeway.client.kroviz.ui.dialog.SvgInline
+import org.apache.causeway.client.kroviz.ui.dialog.*
 import org.apache.causeway.client.kroviz.ui.menu.DropDownMenuBuilder
 import org.apache.causeway.client.kroviz.ui.panel.GeoMap
 import org.apache.causeway.client.kroviz.ui.panel.ImageSample
@@ -204,6 +201,11 @@ class RoMenuBar : SimplePanel() {
             buildMenuEntry(imageTitle, "Image", { ViewManager.add(imageTitle, ImageSample) })
         )
 
+        val vegaTitle = "Vega Sample"
+        subMenu.add(
+            buildMenuEntry(vegaTitle, "Image", { VegaSample().open() })
+        )
+
         mainMenu.add(subMenu)
 
         return mainMenu
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/VegaSample.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/VegaSample.kt
new file mode 100644
index 0000000000..01475f5656
--- /dev/null
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/VegaSample.kt
@@ -0,0 +1,233 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.causeway.client.kroviz.ui.dialog
+
+import io.kvision.utils.obj
+import org.apache.causeway.client.kroviz.core.event.ReplayController
+import org.apache.causeway.client.kroviz.to.ValueType
+import org.apache.causeway.client.kroviz.ui.core.FormItem
+import org.apache.causeway.client.kroviz.ui.core.RoDialog
+import org.apache.causeway.client.kroviz.ui.core.ViewManager
+
+class VegaSample(val nextController: Controller? = null) : Controller() {
+
+    //Default values
+    val spec = obj {
+        this["\$schema"] = "https://vega.github.io/schema/vega/v5.json"
+        this.description = "A basic bar chart example, with value labels shown upon mouse hover."
+        this.width = 400
+        this.height = 200
+        this.padding = 5
+        this.data = arrayOf(
+            obj {
+                this.name = "table"
+                this.values = arrayOf(
+                    obj {
+                        this.category = "A"
+                        this.amount = 28
+                    },
+                    obj {
+                        this.category = "B"
+                        this.amount = 55
+                    },
+                    obj {
+                        this.category = "C"
+                        this.amount = 43
+                    },
+                    obj {
+                        this.category = "D"
+                        this.amount = 91
+                    },
+                    obj {
+                        this.category = "E"
+                        this.amount = 81
+                    },
+                    obj {
+                        this.category = "F"
+                        this.amount = 53
+                    },
+                    obj {
+                        this.category = "G"
+                        this.amount = 19
+                    },
+                    obj {
+                        this.category = "H"
+                        this.amount = 87
+                    }
+                )
+            }
+        )
+        this.signals = arrayOf(
+            obj {
+                this.name = "tooltip"
+                this.value = obj {
+                }
+                this.on = arrayOf(
+                    obj {
+                        this.events = "rect:mouseover"
+                        this.update = "datum"
+                    },
+                    obj {
+                        this.events = "rect:mouseout"
+                        this.update = "{}"
+                    }
+                )
+            }
+        )
+        this.scales = arrayOf(
+            obj {
+                this.name = "xscale"
+                this.type = "band"
+                this.domain = obj {
+                    this.data = "table"
+                    this.field = "category"
+                }
+                this.range = "width"
+                this.padding = 0.05
+                this.round = true
+            },
+            obj {
+                this.name = "yscale"
+                this.domain = obj {
+                    this.data = "table"
+                    this.field = "amount"
+                }
+                this.nice = true
+                this.range = "height"
+            }
+        )
+        this.axes = arrayOf(
+            obj {
+                this.orient = "bottom"
+                this.scale = "xscale"
+            },
+            obj {
+                this.orient = "left"
+                this.scale = "yscale"
+            }
+        )
+        this.marks = arrayOf(
+            obj {
+                this.type = "rect"
+                this.from = obj {
+                    this.data = "table"
+                }
+                this.encode = obj {
+                    this.enter = obj {
+                        this.x = obj {
+                            this.scale = "xscale"
+                            this.field = "category"
+                        }
+                        this.width = obj {
+                            this.scale = "xscale"
+                            this.band = 1
+                        }
+                        this.y = obj {
+                            this.scale = "yscale"
+                            this.field = "amount"
+                        }
+                        this.y2 = obj {
+                            this.scale = "yscale"
+                            this.value = 0
+                        }
+                    }
+                    this.update = obj {
+                        this.fill = obj {
+                            this.value = "steelblue"
+                        }
+                    }
+                    this.hover = obj {
+                        this.fill = obj {
+                            this.value = "red"
+                        }
+                    }
+                }
+            },
+            obj {
+                this.type = "text"
+                this.encode = obj {
+                    this.enter = obj {
+                        this.align = obj {
+                            this.value = "center"
+                        }
+                        this.baseline = obj {
+                            this.value = "bottom"
+                        }
+                        this.fill = obj {
+                            this.value = "#333"
+                        }
+                    }
+                    this.update = obj {
+                        this.x = obj {
+                            this.scale = "xscale"
+                            this.signal = "tooltip.category"
+                            this.band = 0.5
+                        }
+                        this.y = obj {
+                            this.scale = "yscale"
+                            this.signal = "tooltip.amount"
+                            this.offset = -2
+                        }
+                        this.text = obj {
+                            this.signal = "tooltip.amount"
+                        }
+                        this.fillOpacity = arrayOf(
+                            obj {
+                                this.test = "datum === tooltip"
+                                this.value = 0
+                            },
+                            obj {
+                                this.value = 1
+                            }
+                        )
+                    }
+                }
+            }
+        )
+    }
+
+
+    fun embed(spec: String): dynamic {
+        return js(
+            code = """
+                var embed  = require('vega');
+                var result = embed('#vis', spec);
+                console.log(result.view);
+                return result;
+                """
+        )
+    }
+
+    override fun open() {
+        val formItems = mutableListOf<FormItem>()
+        formItems.add(FormItem("Diagram", ValueType.CANVAS, embed(spec)))
+        dialog = RoDialog(caption = "Vega Sample", items = formItems, controller = this, heightPerc = 27)
+        val at = ViewManager.position!!
+        dialog.open(at)
+    }
+
+    override fun execute(action: String?) {
+        if (nextController is ReplayController) {
+            nextController.open()
+        } else {
+            ViewManager.closeDialog(dialog)
+        }
+    }
+
+}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt
similarity index 76%
copy from incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt
copy to incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt
index aa5264c668..ea7accd87c 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt
@@ -18,14 +18,12 @@
  */
 package org.apache.causeway.client.kroviz.utils.js
 
-object ShowDown {
-    fun convertMarkDown2Html(text: String): dynamic {
-        //TODO content.replace(":Notice:", "")
+object AsciiDoctor {
+    fun convert(content: String): dynamic {
         return js(
-            """
-                  var showdown  = require('showdown'),
-                  converter = new showdown.Converter(),
-                  html = converter.makeHtml(text);
+            code = """
+                  var asciidoctor = require('asciidoctor')();
+                  var html = asciidoctor.convert(content);
                   return html;
                """
         )
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/Vega.kt
similarity index 70%
rename from incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt
rename to incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/Vega.kt
index aa5264c668..0e899436b2 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/Vega.kt
@@ -18,16 +18,12 @@
  */
 package org.apache.causeway.client.kroviz.utils.js
 
-object ShowDown {
-    fun convertMarkDown2Html(text: String): dynamic {
-        //TODO content.replace(":Notice:", "")
-        return js(
-            """
-                  var showdown  = require('showdown'),
-                  converter = new showdown.Converter(),
-                  html = converter.makeHtml(text);
-                  return html;
-               """
-        )
+@JsModule("vega")
+@JsNonModule
+external object Vega {
+    fun parse(spec: dynamic): dynamic
+    class View(spec: dynamic, options: dynamic) {
+        fun runAsync()
     }
+
 }
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.json b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.json
index 35e3e62ed9..6a1f2175b7 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.json
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.json
@@ -1,135 +1,21 @@
 {
-  "links": [
-    {
-      "rel": "self",
-      "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=",
-      "method": "GET",
-      "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object\"",
-      "title": "String data type"
-    },
-    {
-      "rel": "describedby",
-      "href": "http://localhost:8080/restful/domain-types/demo.JavaLangStrings",
-      "method": "GET",
-      "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
-    },
-    {
-      "rel": "urn:org.apache.causeway.restfulobjects:rels/object-layout",
-      "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/object-layout",
-      "method": "GET",
-      "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-layout-bs3\""
-    },
-    {
-      "rel": "urn:org.apache.causeway.restfulobjects:rels/object-icon",
-      "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/object-icon",
-      "method": "GET",
-      "type": "image/*"
-    },
-    {
-      "rel": "urn:org.restfulobjects:rels/update",
-      "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings:PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=",
-      "method": "PUT",
-      "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object\"",
-      "arguments": {}
-    }
-  ],
-  "extensions": {
-    "oid": "demo.JavaLangStrings:PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=",
-    "isService": false,
-    "isPersistent": true
+  "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
+  "data": {
+    "values": [
+      {"a": "C", "b": 2},
+      {"a": "C", "b": 7},
+      {"a": "C", "b": 4},
+      {"a": "D", "b": 1},
+      {"a": "D", "b": 2},
+      {"a": "D", "b": 6},
+      {"a": "E", "b": 8},
+      {"a": "E", "b": 4},
+      {"a": "E", "b": 7}
+    ]
   },
-  "title": "String data type",
-  "domainType": "demo.JavaLangStrings",
-  "instanceId": "PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=",
-  "members": {
-    "description": {
-      "id": "description",
-      "memberType": "property",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;property=\"description\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/properties/description",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\""
-        }
-      ],
-      "value": "<div class=\"paragraph\">\n<p>The framework has built-in support for the <code>String</code> data type.</p>\n</div>\n<div class=\"paragraph\">\n<p>From here you can:</p>\n</div>\n<div class=\"ulist\">\n<ul>\n<li>\n<p>navigate to an entity that uses the <code>String</code> datatype</p>\n</li>\n<li>\n<p>open a view model that uses the <code>String</code> datatype</p>\n</li>\n</ul>\n</div>\n<div class=\"paragraph\">\n<p>Some properties on these domain objects are mandatory,  [...]
-      "format": "string",
-      "extensions": {
-        "x-causeway-format": "string"
-      },
-      "disabledReason": "Contributed property"
-    },
-    "logicalTypeName": {
-      "id": "logicalTypeName",
-      "memberType": "property",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;property=\"logicalTypeName\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/properties/logicalTypeName",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\""
-        }
-      ],
-      "value": "demo.JavaLangStrings",
-      "extensions": {
-        "x-causeway-format": "string"
-      },
-      "disabledReason": "Contributed property"
-    },
-    "sources": {
-      "id": "sources",
-      "memberType": "property",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;property=\"sources\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/properties/sources",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-property\""
-        }
-      ],
-      "value": "<div class=\"paragraph\">\n<p><a href=\"https://github.com/apache/causeway/tree/master/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings\">Sources</a> for this demo</p>\n</div>",
-      "format": "string",
-      "extensions": {
-        "x-causeway-format": "string"
-      },
-      "disabledReason": "Contributed property"
-    },
-    "entities": {
-      "id": "entities",
-      "memberType": "collection",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;collection=\"entities\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/collections/entities",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-collection\""
-        }
-      ]
-    },
-    "openViewModel": {
-      "id": "openViewModel",
-      "memberType": "action",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;action=\"openViewModel\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/actions/openViewModel",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-action\""
-        }
-      ]
-    },
-    "clearHints": {
-      "id": "clearHints",
-      "memberType": "action",
-      "links": [
-        {
-          "rel": "urn:org.restfulobjects:rels/details;action=\"clearHints\"",
-          "href": "http://localhost:8080/restful/objects/demo.JavaLangStrings/PADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8vPgo=/actions/clearHints",
-          "method": "GET",
-          "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/object-action\""
-        }
-      ]
-    }
+  "mark": "point",
+  "encoding": {
+    "x": {"field": "a", "type": "nominal"},
+    "y": {"field": "b", "type": "quantitative"}
   }
-}
+}
\ No newline at end of file