You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/10/13 11:24:50 UTC

[causeway-app-referenceapp] 01/01: merge from 'master'

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

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

commit 6a4ceacaac4b9a40b0f735f6adb41d3168a9b89f
Merge: 7e04785 4db983b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 13 13:24:41 2023 +0200

    merge from 'master'

 .editorconfig                                      | 370 +++++++++++++++++++++
 README.adoc                                        |   8 -
 README.md                                          |  26 ++
 _images/screenshot.png                             | Bin 0 -> 715567 bytes
 .../src/main/java/demoapp/dom/DemoModuleJpa.java   |   9 +-
 .../dom/_infra/PdfJsViewerAdvisorFallback.java     |   4 +-
 .../HasAsciiDocDescription_description.java        |   3 +-
 .../HasAsciiDocDescription_sources.java            |   5 +-
 .../_infra/resources/AsciiDocConverterService.java |   1 -
 .../resources/MarkupVariableResolverService.java   |   2 +-
 .../demoapp/dom/_infra/samples/EnumSamples.java    |   3 +-
 .../demoapp/dom/_infra/samples/NameSamples.java    |   3 +-
 .../dom/_infra/seed/SeedServiceAbstract.java       |   3 +-
 .../java/demoapp/dom/_infra/utils/LogUtils.java    |   4 +-
 .../dom/domain/_changes/ChangesVm-description.adoc |   2 +-
 .../demoapp/dom/domain/_changes/ChangesVm.java     |   1 -
 .../_changes/ExposeCapturedChanges_clear.java      |   3 +-
 .../_interactions/ExposePersistedExecutions.java   |  27 --
 .../ExposePersistedExecutions_interactions.java    |  56 ----
 .../dom/domain/_interactions/InteractionDtoVm.java |   1 -
 .../_interactions/InteractionDtoVm.layout.xml      |  69 ----
 .../InteractionsDtoVm-description.adoc             |   3 -
 .../_propertychanges/ExposePropertyChanges.java    |  27 --
 .../ExposePropertyChanges_propertyChanges.java     |  50 ---
 .../dom/domain/actions/Action/ActionMenu.java      |   5 +-
 .../ActionChoicesFromPage-description.adoc         |   2 +-
 .../Action/choicesFrom/ActionChoicesFromPage.java  |   1 -
 .../choicesFrom/ActionChoicesFromPage_objects.java |   3 +-
 .../jdo/ActionChoicesFromEntityImpl.java           |   6 +-
 .../jpa/ActionChoicesFromEntityImpl.java           |   3 +-
 .../ActionCommandPublishingPage-description.adoc   |   8 +-
 .../ActionCommandPublishingPage.java               |   1 -
 .../ActionCommandPublishingPage_objects.java       |   3 +-
 .../jdo/ActionCommandPublishingEntityImpl.java     |   3 +-
 .../jpa/ActionCommandPublishingEntityImpl.java     |   3 +-
 .../ActionDomainEventPage-description.adoc         |   6 +-
 .../Action/domainEvent/ActionDomainEventPage.java  |   3 +-
 .../ActionExecutionPublishingPage-description.adoc |  12 +-
 .../ActionExecutionPublishingPage.java             |   1 -
 .../ActionExecutionPublishingPage_objects.java     |   3 +-
 .../jdo/ActionExecutionPublishingEntityImpl.java   |   3 +-
 .../jpa/ActionExecutionPublishingEntityImpl.java   |   3 +-
 .../ActionRestrictToPage-description.adoc          |   2 +-
 .../Action/restrictTo/ActionRestrictToPage.java    |   3 +-
 .../semantics/ActionSemanticsPage-description.adoc |   6 +-
 .../Action/semantics/ActionSemanticsPage.java      |   3 +-
 .../typeOf/ActionTypeOfPage-description.adoc       |   2 +-
 .../actions/Action/typeOf/ActionTypeOfPage.java    |   5 +-
 .../Action/typeOf/child/ActionTypeOfChildVm.java   |   3 +-
 .../actions/ActionLayout/ActionLayoutMenu.java     |   5 +-
 .../ActionLayoutAssociateWithPage-description.adoc |   4 +-
 .../ActionLayoutAssociateWithPage.java             |   5 +-
 .../child/ActionLayoutAssociateWithChildVm.java    |   3 +-
 .../ActionLayoutCssClassPage-description.adoc      |   4 +-
 .../cssClass/ActionLayoutCssClassPage.java         |   3 +-
 .../ActionLayoutCssClassFaPage-description.adoc    |   4 +-
 .../cssClassFa/ActionLayoutCssClassFaPage.java     |   3 +-
 .../ActionLayoutDescribedAsPage-description.adoc   |   4 +-
 .../describedAs/ActionLayoutDescribedAsPage.java   |   5 +-
 .../child/ActionLayoutDescribedAsChildVm.java      |   3 +-
 .../ActionLayoutFieldSetPage-description.adoc      |   4 +-
 .../hidden/ActionLayoutHiddenPage-description.adoc |   8 +-
 .../hidden/ActionLayoutHiddenPage.java             |   3 +-
 .../hidden/ActionLayoutHiddenPage_objects.java     |   3 +-
 .../hidden/jdo/ActionLayoutHiddenEntityImpl.java   |   6 +-
 .../hidden/jpa/ActionLayoutHiddenEntityImpl.java   |   3 +-
 .../named/ActionLayoutNamedPage-description.adoc   |   4 +-
 .../ActionLayout/named/ActionLayoutNamedPage.java  |   1 -
 .../ActionLayoutPositionPage-description.adoc      |   4 +-
 .../position/ActionLayoutPositionPage.java         |   3 +-
 .../ActionLayoutPromptStylePage-description.adoc   |   4 +-
 ...ctPolicyEntity_incrementRedirectEvenIfSame.java |   8 +-
 ...olicyEntity_incrementRedirectOnlyIfDiffers.java |   8 +-
 ...ActionLayoutRedirectPolicyPage-description.adoc |   6 +-
 .../ActionLayoutRedirectPolicyPage.java            |   1 -
 .../jdo/ActionLayoutRedirectPolicyEntityImpl.java  |   3 +-
 .../ActionLayoutSequencePage-description.adoc      |   4 +-
 .../ActionLayoutSequencePage_noopSeqX.java         |   4 +-
 .../ActionLayoutSequencePage_noopSeqY.java         |   4 +-
 ...Page_updateNamePositionedPanelDropDownSeqX.java |   4 +-
 ...Page_updateNamePositionedPanelDropDownSeqY.java |   4 +-
 ...SequencePage_updateNamePositionedPanelSeqX.java |   4 +-
 ...SequencePage_updateNamePositionedRightSeqX.java |   4 +-
 ...SequencePage_updateNamePositionedRightSeqY.java |   4 +-
 .../ActionLayoutSequencePage_updateNameSeqX.java   |   4 +-
 .../ActionLayoutSequencePage_updateNameSeqY.java   |   4 +-
 .../ActionLayoutSequencePage_updateNameSeqZ.java   |   4 +-
 .../child/ActionLayoutSequenceChildVm.java         |  19 +-
 .../CollectionDomainEventPage-description.adoc     |   4 +-
 .../domainEvent/CollectionDomainEventPage.java     |   5 +-
 .../child/CollectionDomainEventChildVm.java        |   3 +-
 .../typeOf/CollectionTypeOfPage-description.adoc   |   2 +-
 .../CollectionLayoutCssClassPage-description.adoc  |   2 +-
 .../cssClass/CollectionLayoutCssClassPage.java     |   5 +-
 .../child/CollectionLayoutCssClassChildVm.java     |   3 +-
 ...ollectionLayoutDefaultViewPage-description.adoc |   8 +-
 .../CollectionLayoutDefaultViewPage.java           |   5 +-
 .../child/CollectionLayoutDefaultViewChildVm.java  |   3 +-
 ...ollectionLayoutDescribedAsPage-description.adoc |   2 +-
 .../child/CollectionLayoutDescribedAsChildVm.java  |  17 +-
 .../CollectionLayoutHiddenPage-description.adoc    |   2 +-
 .../child/CollectionLayoutHiddenChildVm.java       |   3 +-
 .../CollectionLayoutNamedPage-description.adoc     |   2 +-
 .../named/child/CollectionLayoutNamedChildVm.java  |   3 +-
 .../CollectionLayoutPagedPage-description.adoc     |   4 +-
 .../paged/child/CollectionLayoutPagedChildVm.java  |   3 +-
 .../CollectionLayoutSequencePage-description.adoc  |   4 +-
 .../child/CollectionLayoutSequenceChildVm.java     |  17 +-
 .../CollectionLayoutSortedByPage-description.adoc  |   2 +-
 .../sortedBy/CollectionLayoutSortedByPage.java     |   4 +-
 .../CollectionLayout/sortedBy/NameComparator.java  |   4 +-
 .../child/CollectionLayoutSortedByChildVm.java     |   3 +-
 ...ectionLayoutTableDecoratorPage-description.adoc |   4 +-
 .../CollectionLayoutTableDecoratorPage.java        |   5 +-
 .../CollectionLayoutTableDecoratorChildVm.java     |   3 +-
 .../objects/DomainObject/DomainObjectMenu.java     |   5 +-
 .../DomainObjectAliasedPage-description.adoc       |   8 +-
 .../aliased/DomainObjectAliasedPage.java           |   1 -
 .../aliased/DomainObjectAliasedPage_objects.java   |   3 +-
 .../aliased/jdo/DomainObjectAliasedEntityImpl.java |   6 +-
 .../aliased/jpa/DomainObjectAliasedEntityImpl.java |   3 +-
 .../DomainObjectAutoCompletePage-description.adoc  |   4 +-
 .../autoComplete/DomainObjectAutoCompletePage.java |   1 -
 .../jdo/DomainObjectAutoCompleteEntityImpl.java    |   3 +-
 .../DomainObjectBoundingPage-description.adoc      |   2 +-
 .../bounded/DomainObjectBoundingPage.java          |   1 -
 .../bounded/DomainObjectBoundingPage_objects.java  |   3 +-
 .../jdo/DomainObjectBoundingEntityImpl.java        |   6 +-
 .../bounded/jdo/DomainObjectBoundingPage_find.java |   3 +-
 .../jpa/DomainObjectBoundingEntityImpl.java        |   3 +-
 .../bounded/jpa/DomainObjectBoundingPage_find.java |   3 +-
 .../DomainObjectEditingPage-description.adoc       |  10 +-
 .../editing/DomainObjectEditingPage.java           |   1 -
 .../editing/DomainObjectEditingPage_objects.java   |   3 +-
 .../editing/jdo/DomainObjectEditingEntityImpl.java |   6 +-
 .../editing/jpa/DomainObjectEditingEntityImpl.java |   3 +-
 ...PublishingEntity_updatePropertyUsingAction.java |   3 +-
 ...jectEntityChangePublishingPage-description.adoc |   2 +-
 .../DomainObjectEntityChangePublishingPage.java    |   1 -
 ...ainObjectEntityChangePublishingPage_modify.java |   1 -
 ...inObjectEntityChangePublishingPage_objects.java |   3 +-
 ...mainObjectEntityChangePublishingEntityImpl.java |   6 +-
 ...mainObjectEntityChangePublishingEntityImpl.java |   3 +-
 .../DomainObjectIntrospectionPage-description.adoc |   6 +-
 .../DomainObjectIntrospectionPage.java             |   1 -
 ...ObjectIntrospectionPage_annotationOptional.java |   3 +-
 ...ObjectIntrospectionPage_annotationRequired.java |   3 +-
 ...omainObjectIntrospectionAnnotOptEntityImpl.java |   3 +-
 ...omainObjectIntrospectionAnnotOptEntityImpl.java |   3 +-
 ...mainObjectIntrospectionAnnotReqdEntityImpl.java |   3 +-
 ...mainObjectIntrospectionAnnotReqdEntityImpl.java |   3 +-
 ...nObjectIntrospectionEncapsulatedEntityImpl.java |   3 +-
 ...nObjectIntrospectionEncapsulatedEntityImpl.java |   3 +-
 .../DomainObjectMixinMethodEntity-description.adoc |   2 +-
 .../DomainObjectMixinMethodPage-description.adoc   |   4 +-
 .../mixinMethod/DomainObjectMixinMethodPage.java   |   1 -
 .../DomainObjectMixinMethodPage_objects.java       |   3 +-
 .../DomainObjectMixinMethodPage_updateName.java    |   3 +-
 .../jdo/DomainObjectMixinMethodEntityImpl.java     |   6 +-
 .../jpa/DomainObjectMixinMethodEntityImpl.java     |   3 +-
 .../nature/DomainObjectNaturePage.java             |   1 -
 .../nature/DomainObjectNaturePage_entities.java    |   3 +-
 .../nature/DomainObjectNaturePage_viewModels.java  |   3 +-
 .../entity/jdo/DomainObjectNatureEntityImpl.java   |   6 +-
 .../entity/jpa/DomainObjectNatureEntityImpl.java   |   3 +-
 .../DomainObjectNatureViewModel-description.adoc   |   2 +-
 .../viewmodel/DomainObjectNatureViewModel.java     |   5 +-
 ...DomainObjectXxxDomainEventPage-description.adoc |   4 +-
 .../DomainObjectXxxDomainEventPage.java            |   5 +-
 .../child/DomainObjectXxxDomainEventChildVm.java   |   3 +-
 .../DomainObjectLifecycleEventVm.java              |   9 +-
 ...ainObjectXxxLifecycleEventPage-description.adoc |  30 +-
 .../DomainObjectXxxLifecycleEventPage.java         |   3 +-
 ...inObjectXxxLifecycleEventPage_createEntity.java |   5 +-
 ...inObjectXxxLifecycleEventPage_deleteEntity.java |   3 +-
 .../DomainObjectXxxLifecycleEventSubscriber.java   |   3 +-
 .../DomainObjectXxxLifecycleEventEntityImpl.java   |   6 +-
 .../DomainObjectXxxLifecycleEventEntityImpl.java   |   3 +-
 .../DomainObjectLayoutBookmarkingNestedVm.java     |   3 +-
 ...ainObjectLayoutBookmarkingPage-description.adoc |   8 +-
 .../DomainObjectLayoutBookmarkingPage.java         |   1 -
 .../DomainObjectLayoutBookmarkingPage_objects.java |   3 +-
 .../DomainObjectLayoutBookmarking_addChildren.java |   3 +-
 ...mainObjectLayoutBookmarkingChildEntityImpl.java |   6 +-
 .../DomainObjectLayoutBookmarkingEntityImpl.java   |   6 +-
 ...mainObjectLayoutBookmarkingChildEntityImpl.java |   3 +-
 .../DomainObjectLayoutBookmarkingEntityImpl.java   |   3 +-
 ...DomainObjectLayoutCssClassPage-description.adoc |   4 +-
 .../cssClass/DomainObjectLayoutCssClassPage.java   |   1 -
 .../DomainObjectLayoutCssClassPage_objects.java    |   3 +-
 .../jdo/DomainObjectLayoutCssClassEntityImpl.java  |   6 +-
 .../jpa/DomainObjectLayoutCssClassEntityImpl.java  |   3 +-
 ...mainObjectLayoutCssClassFaPage-description.adoc |   2 +-
 .../DomainObjectLayoutCssClassFaPage.java          |   1 -
 .../DomainObjectLayoutCssClassFaPage_objects.java  |   3 +-
 .../DomainObjectLayoutCssClassFaEntityImpl.java    |   6 +-
 .../DomainObjectLayoutCssClassFaEntityImpl.java    |   3 +-
 ...ainObjectLayoutDescribedAsPage-description.adoc |   2 +-
 .../DomainObjectLayoutDescribedAsPage.java         |   1 -
 .../DomainObjectLayoutDescribedAsPage_objects.java |   3 +-
 .../DomainObjectLayoutDescribedAsEntityImpl.java   |   6 +-
 .../DomainObjectLayoutDescribedAsEntityImpl.java   |   3 +-
 .../DomainObjectLayoutNamedPage-description.adoc   |   2 +-
 .../named/DomainObjectLayoutNamedPage.java         |   1 -
 .../named/DomainObjectLayoutNamedPage_objects.java |   3 +-
 .../jdo/DomainObjectLayoutNamedEntityImpl.java     |   6 +-
 .../jpa/DomainObjectLayoutNamedEntityImpl.java     |   3 +-
 .../DomainObjectLayoutPagedPage-description.adoc   |   4 +-
 .../paged/DomainObjectLayoutPagedPage.java         |   1 -
 ...jectLayoutPagedPage_actionReturningObjects.java |   3 +-
 .../paged/DomainObjectLayoutPagedPage_objects.java |   3 +-
 .../jdo/DomainObjectLayoutPagedEntityImpl.java     |   6 +-
 .../jpa/DomainObjectLayoutPagedEntityImpl.java     |   3 +-
 ...ObjectLayoutTableDecoratorPage-description.adoc |   6 +-
 ...tTableDecoratorPage_actionReturningObjects.java |   3 +-
 ...mainObjectLayoutTableDecoratorPage_objects.java |   3 +-
 ...DomainObjectLayoutTableDecoratorEntityImpl.java |   6 +-
 ...DomainObjectLayoutTableDecoratorEntityImpl.java |   3 +-
 ...mainObjectLayoutXxxUiEventPage-description.adoc |  10 +-
 .../DomainObjectLayoutXxxUiEventPage.java          |   1 -
 .../DomainObjectLayoutXxxUiEventPage_objects.java  |   3 +-
 .../DomainObjectLayoutXxxUiEventEntityImpl.java    |   6 +-
 .../DomainObjectLayoutXxxUiEventEntityImpl.java    |   3 +-
 .../domain/properties/Property/PropertyMenu.java   |  12 +-
 .../PropertyCommandPublishingPage-description.adoc |   8 +-
 .../PropertyCommandPublishingPage.java             |   1 -
 .../PropertyCommandPublishingPage_objects.java     |   3 +-
 .../jdo/PropertyCommandPublishingEntityImpl.java   |   6 +-
 .../jpa/PropertyCommandPublishingEntityImpl.java   |   3 +-
 .../PropertyDomainEventPage-description.adoc       |   6 +-
 .../domainEvent/PropertyDomainEventPage.java       |   3 +-
 .../editing/PropertyEditingPage-description.adoc   |  10 +-
 .../Property/editing/PropertyEditingPage.java      |   1 -
 .../editing/PropertyEditingPage_objects.java       |   3 +-
 .../editing/jdo/PropertyEditingEntityImpl.java     |   6 +-
 .../editing/jpa/PropertyEditingEntityImpl.java     |   3 +-
 ...ropertyExecutionPublishingPage-description.adoc |   8 +-
 .../PropertyExecutionPublishingPage.java           |   1 -
 .../PropertyExecutionPublishingPage_objects.java   |   3 +-
 .../jdo/PropertyExecutionPublishingEntityImpl.java |   6 +-
 .../jpa/PropertyExecutionPublishingEntityImpl.java |   3 +-
 .../PropertyFileAcceptPage-description.adoc        |   2 +-
 .../fileAccept/PropertyFileAcceptPage.java         |   3 +-
 .../PropertyMaxLengthPage-description.adoc         |   4 +-
 .../PropertyMustSatisfyPage-description.adoc       |  12 +-
 .../PropertyOptionalityPage-description.adoc       |   2 +-
 .../projecting/PropertyProjectingChildVm.java      |   3 +-
 .../PropertyProjectingPage-description.adoc        |   4 +-
 .../projecting/PropertyProjectingPage.java         |   3 +-
 .../jdo/PropertyProjectingChildEntityImpl.java     |   6 +-
 .../jpa/PropertyProjectingChildEntityImpl.java     |   3 +-
 .../PropertyRegexPatternPage-description.adoc      |   2 +-
 .../regexPattern/PropertyRegexPatternPage.java     |   3 +-
 .../snapshot/PropertySnapshotPage-description.adoc |   4 +-
 .../Property/snapshot/PropertySnapshotPage.java    |   3 +-
 .../snapshot/PropertySnapshotPage_friends.java     |   3 +-
 .../snapshot/jdo/PropertySnapshotEntityImpl.java   |   3 +-
 .../snapshot/jpa/PropertySnapshotEntityImpl.java   |   3 +-
 .../PropertyLayoutCssClassPage-description.adoc    |   4 +-
 .../cssClass/PropertyLayoutCssClassPage.java       |   3 +-
 .../PropertyLayoutDescribedAsPage-description.adoc |   6 +-
 .../describedAs/PropertyLayoutDescribedAsPage.java |   3 +-
 .../PropertyLayoutHiddenPage-description.adoc      |   8 +-
 .../hidden/PropertyLayoutHiddenPage.java           |   3 +-
 .../hidden/PropertyLayoutHiddenPage_objects.java   |   3 +-
 .../hidden/jdo/PropertyLayoutHiddenEntityImpl.java |   6 +-
 .../hidden/jpa/PropertyLayoutHiddenEntityImpl.java |   3 +-
 ...ropertyLayoutLabelPositionPage-description.adoc |   2 +-
 .../PropertyLayoutLabelPositionPage.java           |   3 +-
 ...tLabelPositionPage_updateLabelPositionLeft.java |  11 +-
 ...sitionPage_updateLabelPositionNotSpecified.java |  11 +-
 ...utLabelPositionPage_updateLabelPositionTop.java |  11 +-
 .../PropertyLayoutMultiLinePage-description.adoc   |   4 +-
 .../multiLine/PropertyLayoutMultiLinePage.java     |   3 +-
 .../named/PropertyLayoutNamedPage-description.adoc |   4 +-
 .../named/PropertyLayoutNamedPage.java             |   3 +-
 .../navigable/FileNodeVm-description.adoc          |   4 +-
 .../PropertyLayoutRepaintingPage-description.adoc  |   4 +-
 .../repainting/PropertyLayoutRepaintingPage.java   |   1 -
 ...ropertyLayoutTypicalLengthPage-description.adoc |   6 +-
 .../PropertyLayoutTypicalLengthPage.java           |   3 +-
 .../ValueSemantics/ValueSemanticsMenu.java         |   3 +-
 ...anticsDateRenderAdjustDaysPage-description.adoc |   2 +-
 .../ValueSemantics/percentage/Percentage.java      |   4 +-
 ...emanticsProviderPercentagePage-description.adoc |   2 +-
 .../cal/CalendarEventsPage-description.adoc        |   2 +-
 .../causewayext/cal/CalendarEventsPage.java        |   2 -
 ...ausewayCalendarEventHolder_actionReturning.java |   1 -
 ...endarEventHolder_actionReturningCollection.java |   4 +-
 .../CausewayCalendarEventHolder_mixinProperty.java |   1 -
 ...EventHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...CalendarEventHolder_updateReadOnlyProperty.java |   1 -
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../cal/jdo/CausewayCalendarEventJdo.java          |   4 +-
 .../cal/jpa/CausewayCalendarEventJpa.java          |   3 +-
 .../cal/vm/CausewayCalendarEventVm.java            |   4 +-
 .../customui/WhereInTheWorldPage-description.adoc  |   6 +-
 .../dom/featured/customui/WhereInTheWorldPage.java |   3 +-
 .../layout/tooltip/TooltipPage-description.adoc    |   2 +-
 .../dom/featured/layout/tooltip/TooltipPage.java   |   3 +-
 .../dom/homepage/DemoHomePage-description.adoc     |   2 +-
 .../java/demoapp/dom/progmodel/actions/TvShow.java |   4 +-
 .../autocomplete/ActionAutoCompleteMenu.java       |  15 +-
 .../autocomplete/ActionAutoCompletePage.java       |   4 +-
 .../ActionAutoCompletePage_selectTvCharacter.java  |   3 +-
 ...onAutoCompletePage_selectTvCharacterByShow.java |   3 +-
 .../ActionAutoCompletePage_selectTvCharacters.java |   3 +-
 ...nAutoCompletePage_selectTvCharactersByShow.java |   5 +-
 ...AutoCompletePage_selectTvCharactersByShows.java |   3 +-
 .../actions/bulk/BulkActionItemEntity.java         |   6 +-
 .../dom/progmodel/actions/bulk/BulkActionMenu.java |   6 +-
 .../actions/bulk/BulkActionPage-description.adoc   |   4 +-
 .../dom/progmodel/actions/bulk/BulkActionPage.java |   7 +-
 .../actions/bulk/jdo/BulkActionItemEntityImpl.java |   6 +-
 .../actions/bulk/jpa/BulkActionItemEntityImpl.java |   3 +-
 .../actions/choices/ActionChoicesMenu.java         |   3 +-
 .../actions/choices/ActionChoicesPage.java         |   9 +-
 .../ActionChoicesPage_selectTvCharacter.java       |   3 +-
 .../ActionChoicesPage_selectTvCharacterByShow.java |   3 +-
 .../ActionChoicesPage_selectTvCharacters.java      |   3 +-
 ...ActionChoicesPage_selectTvCharactersByShow.java |   5 +-
 ...ctionChoicesPage_selectTvCharactersByShows.java |   3 +-
 .../actions/defaults/ActionDefaultsMenu.java       |   3 +-
 .../actions/defaults/ActionDefaultsPage.java       |   9 +-
 ...ActionDefaultsPage_selectTvCharacterByShow.java |  15 +-
 .../ActionDefaultsPage_selectTvCharacters.java     |   3 +-
 ...efaultsPage_selectTvCharactersByShowAndSex.java |   5 +-
 .../actions/validate/ActionValidateMenu.java       |   3 +-
 .../validate/ActionValidatePage-description.adoc   |   2 +-
 .../actions/validate/ActionValidatePage.java       |   7 +-
 ...ActionValidatePage_selectTvCharacterByShow.java |   3 +-
 .../ActionValidatePage_selectTvCharacters.java     |  13 +-
 ...ge_selectTvCharactersByShowAndSexUsingName.java |  15 +-
 ..._selectTvCharactersByShowAndSexUsingRecord.java |   5 +-
 .../dom/progmodel/actions/veto/ActionVetoMenu.java |   3 +-
 .../dom/progmodel/actions/veto/ActionVetoPage.java |   7 +-
 .../ActionVetoPage_selectTvCharactersBySex.java    |  16 +-
 ...onVetoPage_selectTvCharactersIfNotDisabled.java |   3 +-
 ...tionVetoPage_selectTvCharactersIfNotHidden.java |   7 +-
 .../CompositeValueTypePage-description.adoc        |   8 +-
 .../CompositeValueTypePage_addComplexNumber.java   |   8 +-
 .../customvalues/EmailAddressValueSemantics.java   |  13 +-
 .../ScalarValueTypePage-description.adoc           |   8 +-
 .../customvalues/ScalarValueTypePage.java          |   3 +-
 .../embeddedvalues/jdo/NumberConstantJdo.java      |   8 +-
 .../jdo/NumberConstantJdoRepository.java           |   3 +-
 .../embeddedvalues/jpa/NumberConstantJpa.java      |   5 +-
 .../jpa/NumberConstantJpaRepository.java           |   3 +-
 .../dom/progmodel/mixins/FibonacciNumberVm.java    |   1 -
 .../demoapp/dom/progmodel/mixins/MixinPage.java    |   3 +-
 .../ErrorReportingServiceDemoPage-description.adoc |   4 +-
 .../ErrorReportingServiceDemoPage.java             |   1 -
 .../EventBusServiceDemoPage-description.adoc       |   2 +-
 .../core/eventbusservice/EventLogEntryJdo.java     |   6 +-
 .../EventLogEntryJdoRepository.java                |   3 +-
 .../core/eventbusservice/EventLogEntryJpa.java     |   3 +-
 .../EventLogEntryJpaRepository.java                |   3 +-
 .../eventbusservice/EventLogEntryRepository.java   |   3 +-
 .../MessageServiceDemoPage-description.adoc        |   2 +-
 .../WrapperFactoryDemoPage-description.adoc        |   4 +-
 .../wrapperFactory/WrapperFactoryDemoPage.java     |   1 -
 .../core/wrapperFactory/jdo/PrimeNumberJdo.java    |   4 +-
 .../core/wrapperFactory/jpa/PrimeNumberJpa.java    |   3 +-
 .../jpa/PrimeNumberJpaFactoryAndRepository.java    |   7 +-
 .../apptenancy/AppTenancyPage-description.adoc     |   4 +-
 .../secman/apptenancy/AppTenancyPage.java          |   1 -
 .../ApplicationTenancyEvaluatorForDemo.java        |   3 +-
 .../secman/apptenancy/jdo/TenantedJdo.java         |   6 +-
 .../secman/apptenancy/jpa/TenantedJpa.java         |   3 +-
 .../dom/types/causeway/blobs/CausewayBlobs.java    |   1 -
 .../holder/CausewayBlobHolder_actionReturning.java |   1 -
 ...usewayBlobHolder_actionReturningCollection.java |   4 +-
 .../holder/CausewayBlobHolder_mixinProperty.java   |   1 -
 ...yBlobHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 .../CausewayBlobHolder_updateReadOnlyProperty.java |   1 -
 ...obHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../blobs/jdo/CausewayBlobJdo-description.adoc     |   2 +-
 .../types/causeway/blobs/jdo/CausewayBlobJdo.java  |   6 +-
 .../blobs/jpa/CausewayBlobJpa-description.adoc     |   2 +-
 .../types/causeway/blobs/jpa/CausewayBlobJpa.java  |   3 +-
 .../blobs/persistence/CausewayBlobEntity.java      |   3 +-
 .../blobs/samples/CausewayBlobsSamples.java        |   3 +-
 .../dom/types/causeway/clobs/CausewayClobs.java    |   1 -
 .../holder/CausewayClobHolder_actionReturning.java |   1 -
 ...usewayClobHolder_actionReturningCollection.java |   4 +-
 .../holder/CausewayClobHolder_mixinProperty.java   |   1 -
 ...yClobHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 .../CausewayClobHolder_updateReadOnlyProperty.java |   1 -
 ...obHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../clobs/jdo/CausewayClobJdo-description.adoc     |   2 +-
 .../types/causeway/clobs/jdo/CausewayClobJdo.java  |   6 +-
 .../clobs/jpa/CausewayClobJpa-description.adoc     |   2 +-
 .../types/causeway/clobs/jpa/CausewayClobJpa.java  |   3 +-
 .../clobs/persistence/CausewayClobEntity.java      |   3 +-
 .../clobs/samples/CausewayClobsSamples.java        |   3 +-
 .../CausewayLocalResourcePaths.java                |   1 -
 ...wayLocalResourcePathHolder_actionReturning.java |   1 -
 ...sourcePathHolder_actionReturningCollection.java |   4 +-
 ...sewayLocalResourcePathHolder_mixinProperty.java |   1 -
 ...ePathHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...lResourcePathHolder_updateReadOnlyProperty.java |   1 -
 ...thHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../jdo/CausewayLocalResourcePathJdo.java          |   7 +-
 .../jpa/CausewayLocalResourcePathJpa.java          |   6 +-
 .../CausewayLocalResourcePathEntity.java           |   3 +-
 .../types/causeway/markups/CausewayMarkups.java    |   1 -
 .../CausewayMarkupHolder_actionReturning.java      |   1 -
 ...ewayMarkupHolder_actionReturningCollection.java |   4 +-
 .../holder/CausewayMarkupHolder_mixinProperty.java |   1 -
 ...arkupHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...ausewayMarkupHolder_updateReadOnlyProperty.java |   1 -
 ...upHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../causeway/markups/jdo/CausewayMarkupJdo.java    |   7 +-
 .../causeway/markups/jpa/CausewayMarkupJpa.java    |   6 +-
 .../markups/persistence/CausewayMarkupEntity.java  |   3 +-
 .../causeway/passwords/CausewayPasswords.java      |   1 -
 .../CausewayPasswordHolder_actionReturning.java    |   1 -
 ...ayPasswordHolder_actionReturningCollection.java |   4 +-
 .../CausewayPasswordHolder_mixinProperty.java      |   1 -
 ...swordHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...sewayPasswordHolder_updateReadOnlyProperty.java |   1 -
 ...rdHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../passwords/jdo/CausewayPasswordJdo.java         |   7 +-
 .../passwords/jpa/CausewayPasswordJpa.java         |   6 +-
 .../persistence/CausewayPasswordEntity.java        |   3 +-
 .../CausewayPasswordEntity_showPassword.java       |   4 +-
 .../causeway/passwords/vm/CausewayPasswordVm.java  |   5 +-
 .../causeway/treenode/FileNodeVm-description.adoc  |   2 +-
 .../dom/types/causeway/treenode/FileNodeVm.java    |   3 +-
 .../causewayval/asciidocs/CausewayAsciiDocs.java   |   1 -
 .../CausewayAsciiDocHolder_actionReturning.java    |   1 -
 ...ayAsciiDocHolder_actionReturningCollection.java |   4 +-
 .../CausewayAsciiDocHolder_mixinProperty.java      |   1 -
 ...iiDocHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...sewayAsciiDocHolder_updateReadOnlyProperty.java |   1 -
 ...ocHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../asciidocs/jdo/CausewayAsciiDocJdo.java         |   7 +-
 .../asciidocs/jpa/CausewayAsciiDocJpa.java         |   4 +-
 .../persistence/CausewayAsciiDocEntity.java        |   3 +-
 .../causewayval/markdowns/CausewayMarkdowns.java   |   1 -
 .../CausewayMarkdownHolder_actionReturning.java    |   1 -
 ...ayMarkdownHolder_actionReturningCollection.java |   4 +-
 .../CausewayMarkdownHolder_mixinProperty.java      |   1 -
 ...kdownHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 ...sewayMarkdownHolder_updateReadOnlyProperty.java |   1 -
 ...wnHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../markdowns/jdo/CausewayMarkdownJdo.java         |   7 +-
 .../markdowns/jpa/CausewayMarkdownJpa.java         |   4 +-
 .../persistence/CausewayMarkdownEntity.java        |   3 +-
 .../dom/types/causewayval/vegas/CausewayVegas.java |   1 -
 .../holder/CausewayVegaHolder_actionReturning.java |   1 -
 ...usewayVegaHolder_actionReturningCollection.java |   4 +-
 .../holder/CausewayVegaHolder_mixinProperty.java   |   1 -
 ...yVegaHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 .../CausewayVegaHolder_updateReadOnlyProperty.java |   1 -
 ...gaHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../causewayval/vegas/jdo/CausewayVegaJdo.java     |   7 +-
 .../causewayval/vegas/jpa/CausewayVegaJpa.java     |   4 +-
 .../vegas/persistence/CausewayVegaEntity.java      |   3 +-
 .../javaawt/images/holder/BufferedImageHolder.java |   4 +-
 .../images/holder/BufferedImageHolder2.java        |   3 +-
 .../BufferedImageHolder_actionReturning.java       |   4 +-
 ...feredImageHolder_actionReturningCollection.java |   6 +-
 .../holder/BufferedImageHolder_mixinProperty.java  |   4 +-
 ...ImageHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 ...BufferedImageHolder_updateReadOnlyProperty.java |   4 +-
 ...geHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 ...feredImageHolder_actionReturningCollection.java |   3 +-
 ...geHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../types/javaawt/images/jdo/BufferedImageJdo.java |   3 +-
 .../images/jdo/BufferedImageJdoEntities.java       |   4 +-
 .../images/jpa/BufferedImageJpaEntities.java       |   4 +-
 .../images/persistence/BufferedImageEntity.java    |   4 +-
 .../images/persistence/BufferedImageSeeding.java   |   6 +-
 .../samples/JavaAwtBufferedImagesSamples.java      |   3 +-
 .../types/javalang/booleans/WrapperBooleans.java   |   2 -
 .../booleans/holder/WrapperBooleanHolder.java      |   2 -
 .../booleans/holder/WrapperBooleanHolder2.java     |   1 -
 .../WrapperBooleanHolder_actionReturning.java      |   2 -
 ...perBooleanHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperBooleanHolder_mixinProperty.java |   2 -
 ...oleanHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 ...rapperBooleanHolder_updateReadOnlyProperty.java |   2 -
 ...anHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../javalang/booleans/jdo/WrapperBooleanJdo.java   |   8 +-
 .../booleans/jdo/WrapperBooleanJdoEntities.java    |   2 -
 .../javalang/booleans/jpa/WrapperBooleanJpa.java   |   5 +-
 .../booleans/jpa/WrapperBooleanJpaEntities.java    |   2 -
 .../booleans/persistence/WrapperBooleanEntity.java |   2 -
 .../persistence/WrapperBooleanSeeding.java         |   2 -
 .../booleans/samples/WrapperBooleanSamples.java    |   2 -
 .../dom/types/javalang/bytes/WrapperBytes.java     |   2 -
 .../javalang/bytes/holder/WrapperByteHolder.java   |   2 -
 .../javalang/bytes/holder/WrapperByteHolder2.java  |   1 -
 .../holder/WrapperByteHolder_actionReturning.java  |   2 -
 ...rapperByteHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperByteHolder_mixinProperty.java    |   2 -
 ...rByteHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 .../WrapperByteHolder_updateReadOnlyProperty.java  |   2 -
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../types/javalang/bytes/jdo/WrapperByteJdo.java   |   8 +-
 .../javalang/bytes/jdo/WrapperByteJdoEntities.java |   2 -
 .../types/javalang/bytes/jpa/WrapperByteJpa.java   |   5 +-
 .../javalang/bytes/jpa/WrapperByteJpaEntities.java |   2 -
 .../bytes/persistence/WrapperByteEntity.java       |   2 -
 .../bytes/persistence/WrapperByteSeeding.java      |   2 -
 .../javalang/bytes/samples/WrapperByteSamples.java |   2 -
 .../javalang/characters/WrapperCharacters.java     |   2 -
 .../characters/holder/WrapperCharacterHolder.java  |   2 -
 .../characters/holder/WrapperCharacterHolder2.java |   1 -
 .../WrapperCharacterHolder_actionReturning.java    |   2 -
 ...rCharacterHolder_actionReturningCollection.java |   5 +-
 .../WrapperCharacterHolder_mixinProperty.java      |   2 -
 ...acterHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 ...pperCharacterHolder_updateReadOnlyProperty.java |   2 -
 ...erHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../characters/jdo/WrapperCharacterJdo.java        |   8 +-
 .../jdo/WrapperCharacterJdoEntities.java           |   2 -
 .../characters/jpa/WrapperCharacterJpa.java        |   5 +-
 .../jpa/WrapperCharacterJpaEntities.java           |   2 -
 .../persistence/WrapperCharacterEntity.java        |   2 -
 .../persistence/WrapperCharacterSeeding.java       |   2 -
 .../samples/WrapperCharacterSamples.java           |   2 -
 .../dom/types/javalang/doubles/WrapperDoubles.java |   2 -
 .../doubles/holder/WrapperDoubleHolder.java        |   2 -
 .../doubles/holder/WrapperDoubleHolder2.java       |   1 -
 .../WrapperDoubleHolder_actionReturning.java       |   2 -
 ...pperDoubleHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperDoubleHolder_mixinProperty.java  |   2 -
 ...oubleHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 ...WrapperDoubleHolder_updateReadOnlyProperty.java |   2 -
 ...leHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../javalang/doubles/jdo/WrapperDoubleJdo.java     |   8 +-
 .../doubles/jdo/WrapperDoubleJdoEntities.java      |   2 -
 .../javalang/doubles/jpa/WrapperDoubleJpa.java     |   5 +-
 .../doubles/jpa/WrapperDoubleJpaEntities.java      |   2 -
 .../doubles/persistence/WrapperDoubleEntity.java   |   2 -
 .../doubles/persistence/WrapperDoubleSeeding.java  |   2 -
 .../doubles/samples/WrapperDoubleSamples.java      |   2 -
 .../dom/types/javalang/enums/JavaLangEnums.java    |   3 +-
 .../javalang/enums/holder/JavaLangEnumHolder2.java |   1 +
 .../holder/JavaLangEnumHolder_actionReturning.java |   1 -
 ...vaLangEnumHolder_actionReturningCollection.java |   4 +-
 .../holder/JavaLangEnumHolder_mixinProperty.java   |   1 -
 ...gEnumHolder_updateReadOnlyOptionalProperty.java |   1 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   4 +-
 .../JavaLangEnumHolder_updateReadOnlyProperty.java |   1 -
 ...umHolder_updateReadOnlyPropertyWithChoices.java |   4 +-
 .../types/javalang/enums/jdo/JavaLangEnumJdo.java  |   7 +-
 .../enums/jdo/JavaLangEnumJdoEntities.java         |   1 -
 .../types/javalang/enums/jpa/JavaLangEnumJpa.java  |   4 +-
 .../enums/jpa/JavaLangEnumJpaEntities.java         |   1 -
 .../enums/persistence/JavaLangEnumEntity.java      |   3 +-
 .../enums/persistence/JavaLangEnumSeeding.java     |   1 -
 .../dom/types/javalang/floats/WrapperFloats.java   |   2 -
 .../javalang/floats/holder/WrapperFloatHolder.java |   2 -
 .../floats/holder/WrapperFloatHolder2.java         |   1 -
 .../holder/WrapperFloatHolder_actionReturning.java |   2 -
 ...apperFloatHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperFloatHolder_mixinProperty.java   |   2 -
 ...FloatHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 .../WrapperFloatHolder_updateReadOnlyProperty.java |   2 -
 ...atHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../types/javalang/floats/jdo/WrapperFloatJdo.java |   8 +-
 .../floats/jdo/WrapperFloatJdoEntities.java        |   2 -
 .../types/javalang/floats/jpa/WrapperFloatJpa.java |   5 +-
 .../floats/jpa/WrapperFloatJpaEntities.java        |   2 -
 .../floats/persistence/WrapperFloatEntity.java     |   2 -
 .../floats/persistence/WrapperFloatSeeding.java    |   2 -
 .../floats/samples/WrapperFloatSamples.java        |   2 -
 .../types/javalang/integers/WrapperIntegers.java   |   2 -
 .../integers/holder/WrapperIntegerHolder.java      |   2 -
 .../integers/holder/WrapperIntegerHolder2.java     |   1 -
 .../WrapperIntegerHolder_actionReturning.java      |   2 -
 ...perIntegerHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperIntegerHolder_mixinProperty.java |   2 -
 ...tegerHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 ...rapperIntegerHolder_updateReadOnlyProperty.java |   2 -
 ...erHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../javalang/integers/jdo/WrapperIntegerJdo.java   |   8 +-
 .../integers/jdo/WrapperIntegerJdoEntities.java    |   2 -
 .../javalang/integers/jpa/WrapperIntegerJpa.java   |   5 +-
 .../integers/jpa/WrapperIntegerJpaEntities.java    |   2 -
 .../integers/persistence/WrapperIntegerEntity.java |   2 -
 .../persistence/WrapperIntegerSeeding.java         |   2 -
 .../integers/samples/WrapperIntegerSamples.java    |   2 -
 .../dom/types/javalang/longs/WrapperLongs.java     |   2 -
 .../javalang/longs/holder/WrapperLongHolder.java   |   2 -
 .../javalang/longs/holder/WrapperLongHolder2.java  |   1 -
 .../holder/WrapperLongHolder_actionReturning.java  |   2 -
 ...rapperLongHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperLongHolder_mixinProperty.java    |   2 -
 ...rLongHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 .../WrapperLongHolder_updateReadOnlyProperty.java  |   2 -
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../types/javalang/longs/jdo/WrapperLongJdo.java   |   8 +-
 .../javalang/longs/jdo/WrapperLongJdoEntities.java |   2 -
 .../types/javalang/longs/jpa/WrapperLongJpa.java   |   5 +-
 .../javalang/longs/jpa/WrapperLongJpaEntities.java |   2 -
 .../longs/persistence/WrapperLongEntity.java       |   2 -
 .../longs/persistence/WrapperLongSeeding.java      |   2 -
 .../javalang/longs/samples/WrapperLongSamples.java |   2 -
 .../dom/types/javalang/shorts/WrapperShorts.java   |   2 -
 .../javalang/shorts/holder/WrapperShortHolder.java |   2 -
 .../shorts/holder/WrapperShortHolder2.java         |   1 -
 .../holder/WrapperShortHolder_actionReturning.java |   2 -
 ...apperShortHolder_actionReturningCollection.java |   5 +-
 .../holder/WrapperShortHolder_mixinProperty.java   |   2 -
 ...ShortHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 .../WrapperShortHolder_updateReadOnlyProperty.java |   2 -
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../types/javalang/shorts/jdo/WrapperShortJdo.java |   8 +-
 .../shorts/jdo/WrapperShortJdoEntities.java        |   2 -
 .../types/javalang/shorts/jpa/WrapperShortJpa.java |   5 +-
 .../shorts/jpa/WrapperShortJpaEntities.java        |   2 -
 .../shorts/persistence/WrapperShortEntity.java     |   2 -
 .../shorts/persistence/WrapperShortSeeding.java    |   2 -
 .../shorts/samples/WrapperShortSamples.java        |   2 -
 .../types/javalang/strings/JavaLangStrings.java    |   2 -
 .../strings/holder/JavaLangStringHolder.java       |   2 -
 .../strings/holder/JavaLangStringHolder2.java      |   1 -
 .../JavaLangStringHolder_actionReturning.java      |   2 -
 ...LangStringHolder_actionReturningCollection.java |   5 +-
 .../holder/JavaLangStringHolder_mixinProperty.java |   2 -
 ...tringHolder_updateReadOnlyOptionalProperty.java |   2 -
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   5 +-
 ...avaLangStringHolder_updateReadOnlyProperty.java |   2 -
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |   5 +-
 .../javalang/strings/jdo/JavaLangStringJdo.java    |   8 +-
 .../strings/jdo/JavaLangStringJdoEntities.java     |   2 -
 .../javalang/strings/jpa/JavaLangStringJpa.java    |   5 +-
 .../strings/jpa/JavaLangStringJpaEntities.java     |   2 -
 .../strings/persistence/JavaLangStringEntity.java  |   2 -
 .../strings/persistence/JavaLangStringSeeding.java |   2 -
 .../types/javamath/bigdecimals/BigDecimals.java    |   3 +-
 .../bigdecimals/holder/BigDecimalHolder.java       |   4 +-
 .../bigdecimals/holder/BigDecimalHolder2.java      |   3 +-
 .../holder/BigDecimalHolder_actionReturning.java   |   4 +-
 ...BigDecimalHolder_actionReturningCollection.java |   6 +-
 .../holder/BigDecimalHolder_mixinProperty.java     |   4 +-
 ...cimalHolder_updateReadOnlyOptionalProperty.java |   6 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   8 +-
 .../BigDecimalHolder_updateReadOnlyProperty.java   |  10 +-
 ...alHolder_updateReadOnlyPropertyWithChoices.java |  11 +-
 .../javamath/bigdecimals/jdo/BigDecimalJdo.java    |  15 +-
 .../bigdecimals/jdo/BigDecimalJdoEntities.java     |   4 +-
 .../javamath/bigdecimals/jpa/BigDecimalJpa.java    |  20 +-
 .../bigdecimals/jpa/BigDecimalJpaEntities.java     |   4 +-
 .../dom/types/javamath/bigdecimals/meta/Money.java |  21 ++
 .../bigdecimals/persistence/BigDecimalEntity.java  |   4 +-
 .../bigdecimals/persistence/BigDecimalSeeding.java |   6 +-
 .../bigdecimals/samples/BigDecimalSamples.java     |   3 +-
 .../types/javamath/bigintegers/BigIntegers.java    |   3 +-
 .../bigintegers/holder/BigIntegerHolder.java       |   4 +-
 .../bigintegers/holder/BigIntegerHolder2.java      |   3 +-
 .../holder/BigIntegerHolder_actionReturning.java   |   4 +-
 ...BigIntegerHolder_actionReturningCollection.java |   6 +-
 .../holder/BigIntegerHolder_mixinProperty.java     |   4 +-
 ...tegerHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../BigIntegerHolder_updateReadOnlyProperty.java   |   4 +-
 ...erHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javamath/bigintegers/jdo/BigIntegerJdo.java    |  10 +-
 .../bigintegers/jdo/BigIntegerJdoEntities.java     |   4 +-
 .../javamath/bigintegers/jpa/BigIntegerJpa.java    |   7 +-
 .../bigintegers/jpa/BigIntegerJpaEntities.java     |   4 +-
 .../bigintegers/persistence/BigIntegerEntity.java  |   4 +-
 .../bigintegers/persistence/BigIntegerSeeding.java |   5 +-
 .../bigintegers/samples/BigIntegerSamples.java     |   3 +-
 .../java/demoapp/dom/types/javanet/urls/Url.java   |   3 +-
 .../dom/types/javanet/urls/holder/UrlHolder.java   |   3 +-
 .../dom/types/javanet/urls/holder/UrlHolder2.java  |   3 +-
 .../urls/holder/UrlHolder_actionReturning.java     |   4 +-
 .../UrlHolder_actionReturningCollection.java       |   6 +-
 .../urls/holder/UrlHolder_mixinProperty.java       |   4 +-
 .../UrlHolder_updateReadOnlyOptionalProperty.java  |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../holder/UrlHolder_updateReadOnlyProperty.java   |   4 +-
 ...rlHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../demoapp/dom/types/javanet/urls/jdo/UrlJdo.java |  11 +-
 .../dom/types/javanet/urls/jdo/UrlJdoEntities.java |   4 +-
 .../demoapp/dom/types/javanet/urls/jpa/UrlJpa.java |   8 +-
 .../dom/types/javanet/urls/jpa/UrlJpaEntities.java |   4 +-
 .../types/javanet/urls/persistence/UrlEntity.java  |   5 +-
 .../types/javanet/urls/persistence/UrlSeeding.java |   5 +-
 .../dom/types/javanet/urls/samples/UrlSamples.java |   3 +-
 .../types/javasql/javasqldate/JavaSqlDates.java    |   3 +-
 .../javasqldate/holder/JavaSqlDateHolder.java      |   3 +-
 .../javasqldate/holder/JavaSqlDateHolder2.java     |   3 +-
 .../holder/JavaSqlDateHolder_actionReturning.java  |   4 +-
 ...avaSqlDateHolder_actionReturningCollection.java |   6 +-
 .../holder/JavaSqlDateHolder_mixinProperty.java    |   4 +-
 ...lDateHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../JavaSqlDateHolder_updateReadOnlyProperty.java  |   4 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javasql/javasqldate/jdo/JavaSqlDateJdo.java    |  11 +-
 .../javasqldate/jdo/JavaSqlDateJdoEntities.java    |   4 +-
 .../javasql/javasqldate/jpa/JavaSqlDateJpa.java    |   8 +-
 .../javasqldate/jpa/JavaSqlDateJpaEntities.java    |   4 +-
 .../javasqldate/persistence/JavaSqlDateEntity.java |   5 +-
 .../persistence/JavaSqlDateSeeding.java            |   5 +-
 .../javasqldate/samples/JavaSqlDateSamples.java    |   3 +-
 .../javasqltimestamp/JavaSqlTimestamps.java        |   3 +-
 .../holder/JavaSqlTimestampHolder.java             |   3 +-
 .../holder/JavaSqlTimestampHolder2.java            |   3 +-
 .../JavaSqlTimestampHolder_actionReturning.java    |   4 +-
 ...lTimestampHolder_actionReturningCollection.java |   6 +-
 .../JavaSqlTimestampHolder_mixinProperty.java      |   4 +-
 ...stampHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 ...aSqlTimestampHolder_updateReadOnlyProperty.java |   4 +-
 ...mpHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javasqltimestamp/jdo/JavaSqlTimestampJdo.java  |  11 +-
 .../jdo/JavaSqlTimestampJdoEntities.java           |   4 +-
 .../javasqltimestamp/jpa/JavaSqlTimestampJpa.java  |   8 +-
 .../jpa/JavaSqlTimestampJpaEntities.java           |   4 +-
 .../persistence/JavaSqlTimestampEntity.java        |   5 +-
 .../persistence/JavaSqlTimestampSeeding.java       |   5 +-
 .../samples/JavaSqlTimestampSamples.java           |   3 +-
 .../javasqltimestamp/vm/JavaSqlTimestampVm.java    |  10 +-
 .../dom/types/javatime/JavaTimeTypesMenu.java      |   1 +
 .../javatime/javatimelocaldate/LocalDates.java     |   3 +-
 .../javatimelocaldate/holder/LocalDateHolder.java  |   3 +-
 .../javatimelocaldate/holder/LocalDateHolder2.java |   3 +-
 .../holder/LocalDateHolder_actionReturning.java    |   4 +-
 .../LocalDateHolder_actionReturningCollection.java |   6 +-
 .../holder/LocalDateHolder_mixinProperty.java      |   4 +-
 ...lDateHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../LocalDateHolder_updateReadOnlyProperty.java    |   4 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javatimelocaldate/jdo/LocalDateJdo.java        |  11 +-
 .../jdo/LocalDateJdoEntities.java                  |   4 +-
 .../javatimelocaldate/jpa/LocalDateJpa.java        |   8 +-
 .../jpa/LocalDateJpaEntities.java                  |   4 +-
 .../persistence/LocalDateEntity.java               |   5 +-
 .../persistence/LocalDateSeeding.java              |   5 +-
 .../samples/LocalDateSamples.java                  |   3 +-
 .../javatime/javatimelocaldate/vm/LocalDateVm.java |  10 +-
 .../javatimelocaldatetime/LocalDateTimes.java      |   3 +-
 .../holder/LocalDateTimeHolder.java                |   3 +-
 .../holder/LocalDateTimeHolder2.java               |   3 +-
 .../LocalDateTimeHolder_actionReturning.java       |   4 +-
 ...alDateTimeHolder_actionReturningCollection.java |   6 +-
 .../holder/LocalDateTimeHolder_mixinProperty.java  |   4 +-
 ...eTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 ...LocalDateTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../jdo/LocalDateTimeJdo.java                      |  11 +-
 .../jdo/LocalDateTimeJdoEntities.java              |   4 +-
 .../jpa/LocalDateTimeJpa.java                      |   8 +-
 .../jpa/LocalDateTimeJpaEntities.java              |   4 +-
 .../persistence/LocalDateTimeEntity.java           |   5 +-
 .../persistence/LocalDateTimeSeeding.java          |   5 +-
 .../samples/LocalDateTimeSamples.java              |   3 +-
 .../javatimelocaldatetime/vm/LocalDateTimeVm.java  |  10 +-
 .../javatime/javatimelocaltime/LocalTimes.java     |   3 +-
 .../javatimelocaltime/holder/LocalTimeHolder.java  |   3 +-
 .../javatimelocaltime/holder/LocalTimeHolder2.java |   3 +-
 .../holder/LocalTimeHolder_actionReturning.java    |   4 +-
 .../LocalTimeHolder_actionReturningCollection.java |   6 +-
 .../holder/LocalTimeHolder_mixinProperty.java      |   4 +-
 ...lTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../LocalTimeHolder_updateReadOnlyProperty.java    |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javatimelocaltime/jdo/LocalTimeJdo.java        |  11 +-
 .../jdo/LocalTimeJdoEntities.java                  |   4 +-
 .../javatimelocaltime/jpa/LocalTimeJpa.java        |   8 +-
 .../jpa/LocalTimeJpaEntities.java                  |   4 +-
 .../persistence/LocalTimeEntity.java               |   5 +-
 .../persistence/LocalTimeSeeding.java              |   5 +-
 .../samples/LocalTimeSamples.java                  |   3 +-
 .../javatime/javatimelocaltime/vm/LocalTimeVm.java |  10 +-
 .../javatimeoffsetdatetime/OffsetDateTimes.java    |   3 +-
 .../holder/OffsetDateTimeHolder.java               |   3 +-
 .../holder/OffsetDateTimeHolder2.java              |   3 +-
 .../OffsetDateTimeHolder_actionReturning.java      |   4 +-
 ...etDateTimeHolder_actionReturningCollection.java |   6 +-
 .../holder/OffsetDateTimeHolder_mixinProperty.java |   4 +-
 ...eTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 ...ffsetDateTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../jdo/OffsetDateTimeJdo.java                     |  11 +-
 .../jdo/OffsetDateTimeJdoEntities.java             |   4 +-
 .../jpa/OffsetDateTimeJpa.java                     |   8 +-
 .../jpa/OffsetDateTimeJpaEntities.java             |   4 +-
 .../persistence/OffsetDateTimeEntity.java          |   5 +-
 .../persistence/OffsetDateTimeSeeding.java         |   5 +-
 .../samples/OffsetDateTimeSamples.java             |   3 +-
 .../vm/OffsetDateTimeVm.java                       |  10 +-
 .../javatime/javatimeoffsettime/OffsetTimes.java   |   3 +-
 .../holder/OffsetTimeHolder.java                   |   3 +-
 .../holder/OffsetTimeHolder2.java                  |   3 +-
 .../holder/OffsetTimeHolder_actionReturning.java   |   4 +-
 ...OffsetTimeHolder_actionReturningCollection.java |   6 +-
 .../holder/OffsetTimeHolder_mixinProperty.java     |   4 +-
 ...tTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../OffsetTimeHolder_updateReadOnlyProperty.java   |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javatimeoffsettime/jdo/OffsetTimeJdo.java      |  11 +-
 .../jdo/OffsetTimeJdoEntities.java                 |   4 +-
 .../javatimeoffsettime/jpa/OffsetTimeJpa.java      |   8 +-
 .../jpa/OffsetTimeJpaEntities.java                 |   4 +-
 .../persistence/OffsetTimeEntity.java              |   5 +-
 .../persistence/OffsetTimeSeeding.java             |   5 +-
 .../samples/OffsetTimeSamples.java                 |   3 +-
 .../javatimeoffsettime/vm/OffsetTimeVm.java        |  10 +-
 .../javatimezoneddatetime/ZonedDateTimes.java      |   3 +-
 .../holder/ZonedDateTimeHolder.java                |   3 +-
 .../holder/ZonedDateTimeHolder2.java               |   3 +-
 .../ZonedDateTimeHolder_actionReturning.java       |   4 +-
 ...edDateTimeHolder_actionReturningCollection.java |   6 +-
 .../holder/ZonedDateTimeHolder_mixinProperty.java  |   4 +-
 ...eTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 ...ZonedDateTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../jdo/ZonedDateTimeJdo.java                      |  11 +-
 .../jdo/ZonedDateTimeJdoEntities.java              |   4 +-
 .../jpa/ZonedDateTimeJpa.java                      |   8 +-
 .../jpa/ZonedDateTimeJpaEntities.java              |   4 +-
 .../persistence/ZonedDateTimeEntity.java           |   5 +-
 .../persistence/ZonedDateTimeSeeding.java          |   5 +-
 .../samples/ZonedDateTimeSamples.java              |   3 +-
 .../javatimezoneddatetime/vm/ZonedDateTimeVm.java  |  10 +-
 .../types/javautil/javautildate/JavaUtilDates.java |   3 +-
 .../javautildate/holder/JavaUtilDateHolder.java    |   3 +-
 .../javautildate/holder/JavaUtilDateHolder2.java   |   3 +-
 .../holder/JavaUtilDateHolder_actionReturning.java |   4 +-
 ...vaUtilDateHolder_actionReturningCollection.java |   6 +-
 .../holder/JavaUtilDateHolder_mixinProperty.java   |   4 +-
 ...lDateHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../JavaUtilDateHolder_updateReadOnlyProperty.java |   4 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../javautil/javautildate/jdo/JavaUtilDateJdo.java |  11 +-
 .../javautildate/jdo/JavaUtilDateJdoEntities.java  |   4 +-
 .../javautil/javautildate/jpa/JavaUtilDateJpa.java |   8 +-
 .../javautildate/jpa/JavaUtilDateJpaEntities.java  |   4 +-
 .../persistence/JavaUtilDateEntity.java            |   5 +-
 .../persistence/JavaUtilDateSeeding.java           |   5 +-
 .../javautildate/samples/JavaUtilDateSamples.java  |   3 +-
 .../dom/types/javautil/uuids/JavaUtilUuids.java    |   3 +-
 .../javautil/uuids/holder/JavaUtilUuidHolder.java  |   3 +-
 .../javautil/uuids/holder/JavaUtilUuidHolder2.java |   3 +-
 .../holder/JavaUtilUuidHolder_actionReturning.java |   4 +-
 ...vaUtilUuidHolder_actionReturningCollection.java |   6 +-
 .../holder/JavaUtilUuidHolder_mixinProperty.java   |   4 +-
 ...lUuidHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   6 +-
 .../JavaUtilUuidHolder_updateReadOnlyProperty.java |   4 +-
 ...idHolder_updateReadOnlyPropertyWithChoices.java |   6 +-
 .../types/javautil/uuids/jdo/JavaUtilUuidJdo.java  |  11 +-
 .../uuids/jdo/JavaUtilUuidJdoEntities.java         |   4 +-
 .../types/javautil/uuids/jpa/JavaUtilUuidJpa.java  |   8 +-
 .../uuids/jpa/JavaUtilUuidJpaEntities.java         |   4 +-
 .../uuids/persistence/JavaUtilUuidEntity.java      |   5 +-
 .../uuids/persistence/JavaUtilUuidSeeding.java     |   5 +-
 .../uuids/samples/JavaUtilUuidSamples.java         |   3 +-
 .../types/jodatime/jodadatetime/JodaDateTimes.java |   4 +-
 .../jodadatetime/holder/JodaDateTimeHolder2.java   |   3 +-
 .../holder/JodaDateTimeHolder_actionReturning.java |   4 +-
 ...daDateTimeHolder_actionReturningCollection.java |   7 +-
 .../holder/JodaDateTimeHolder_mixinProperty.java   |   4 +-
 ...eTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   7 +-
 .../JodaDateTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   7 +-
 .../jodatime/jodadatetime/jdo/JodaDateTimeJdo.java |   9 +-
 .../jodadatetime/jdo/JodaDateTimeJdoEntities.java  |   3 +-
 .../jodatime/jodadatetime/jpa/JodaDateTimeJpa.java |   6 +-
 .../jodadatetime/jpa/JodaDateTimeJpaEntities.java  |   3 +-
 .../persistence/JodaDateTimeEntity.java            |   4 +-
 .../persistence/JodaDateTimeSeeding.java           |   3 +-
 .../jodadatetime/samples/JodaDateTimeSamples.java  |   3 +-
 .../jodatime/jodadatetime/vm/JodaDateTimeVm.java   |   9 +-
 .../jodatime/jodalocaldate/JodaLocalDates.java     |   4 +-
 .../jodalocaldate/holder/JodaLocalDateHolder2.java |   3 +-
 .../JodaLocalDateHolder_actionReturning.java       |   4 +-
 ...aLocalDateHolder_actionReturningCollection.java |   7 +-
 .../holder/JodaLocalDateHolder_mixinProperty.java  |   4 +-
 ...lDateHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   7 +-
 ...JodaLocalDateHolder_updateReadOnlyProperty.java |   4 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   7 +-
 .../jodalocaldate/jdo/JodaLocalDateJdo.java        |   9 +-
 .../jdo/JodaLocalDateJdoEntities.java              |   3 +-
 .../jodalocaldate/jpa/JodaLocalDateJpa.java        |   6 +-
 .../jpa/JodaLocalDateJpaEntities.java              |   3 +-
 .../persistence/JodaLocalDateEntity.java           |   4 +-
 .../persistence/JodaLocalDateSeeding.java          |   3 +-
 .../samples/JodaLocalDateSamples.java              |   3 +-
 .../jodatime/jodalocaldate/vm/JodaLocalDateVm.java |   9 +-
 .../jodalocaldatetime/JodaLocalDateTimes.java      |   4 +-
 .../holder/JodaLocalDateTimeHolder2.java           |   3 +-
 .../JodaLocalDateTimeHolder_actionReturning.java   |   4 +-
 ...alDateTimeHolder_actionReturningCollection.java |   7 +-
 .../JodaLocalDateTimeHolder_mixinProperty.java     |   4 +-
 ...eTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   7 +-
 ...LocalDateTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   7 +-
 .../jdo/JodaLocalDateTimeJdo.java                  |   9 +-
 .../jdo/JodaLocalDateTimeJdoEntities.java          |   3 +-
 .../jpa/JodaLocalDateTimeJpa.java                  |   6 +-
 .../jpa/JodaLocalDateTimeJpaEntities.java          |   3 +-
 .../persistence/JodaLocalDateTimeEntity.java       |   4 +-
 .../persistence/JodaLocalDateTimeSeeding.java      |   3 +-
 .../samples/JodaLocalDateTimeSamples.java          |   3 +-
 .../jodalocaldatetime/vm/JodaLocalDateTimeVm.java  |   9 +-
 .../jodatime/jodalocaltime/JodaLocalTimes.java     |   4 +-
 .../jodalocaltime/holder/JodaLocalTimeHolder2.java |   3 +-
 .../JodaLocalTimeHolder_actionReturning.java       |   4 +-
 ...aLocalTimeHolder_actionReturningCollection.java |   7 +-
 .../holder/JodaLocalTimeHolder_mixinProperty.java  |   4 +-
 ...lTimeHolder_updateReadOnlyOptionalProperty.java |   4 +-
 ..._updateReadOnlyOptionalPropertyWithChoices.java |   7 +-
 ...JodaLocalTimeHolder_updateReadOnlyProperty.java |   4 +-
 ...meHolder_updateReadOnlyPropertyWithChoices.java |   7 +-
 .../jodalocaltime/jdo/JodaLocalTimeJdo.java        |   9 +-
 .../jdo/JodaLocalTimeJdoEntities.java              |   3 +-
 .../jodalocaltime/jpa/JodaLocalTimeJpa.java        |   6 +-
 .../jpa/JodaLocalTimeJpaEntities.java              |   3 +-
 .../persistence/JodaLocalTimeEntity.java           |   4 +-
 .../persistence/JodaLocalTimeSeeding.java          |   3 +-
 .../samples/JodaLocalTimeSamples.java              |   3 +-
 .../jodatime/jodalocaltime/vm/JodaLocalTimeVm.java |   9 +-
 ...rimitiveBooleanHolder_actionReturningArray.java |   3 +-
 ...anHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../booleans/jdo/PrimitiveBooleanJdo.java          |   6 +-
 .../booleans/jpa/PrimitiveBooleanJpa.java          |   3 +-
 .../primitive/booleans/vm/PrimitiveBooleanVm.java  |   5 +-
 .../PrimitiveByteHolder_actionReturningArray.java  |   3 +-
 ...teHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/bytes/jdo/PrimitiveByteJdo.java      |   6 +-
 .../primitive/bytes/jpa/PrimitiveByteJpa.java      |   3 +-
 .../types/primitive/bytes/vm/PrimitiveByteVm.java  |   5 +-
 .../PrimitiveCharHolder_actionReturningArray.java  |   3 +-
 ...arHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/chars/jdo/PrimitiveCharJdo.java      |   6 +-
 .../primitive/chars/jpa/PrimitiveCharJpa.java      |   3 +-
 .../types/primitive/chars/vm/PrimitiveCharVm.java  |   5 +-
 ...PrimitiveDoubleHolder_actionReturningArray.java |   3 +-
 ...leHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/doubles/jdo/PrimitiveDoubleJdo.java  |   6 +-
 .../primitive/doubles/jpa/PrimitiveDoubleJpa.java  |   3 +-
 .../primitive/doubles/vm/PrimitiveDoubleVm.java    |   5 +-
 .../PrimitiveFloatHolder_actionReturningArray.java |   3 +-
 ...atHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/floats/jdo/PrimitiveFloatJdo.java    |   6 +-
 .../primitive/floats/jpa/PrimitiveFloatJpa.java    |   3 +-
 .../primitive/floats/vm/PrimitiveFloatVm.java      |   5 +-
 .../PrimitiveIntHolder_actionReturningArray.java   |   3 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../types/primitive/ints/jdo/PrimitiveIntJdo.java  |   6 +-
 .../types/primitive/ints/jpa/PrimitiveIntJpa.java  |   3 +-
 .../types/primitive/ints/vm/PrimitiveIntVm.java    |   5 +-
 .../dom/types/primitive/longs/PrimitiveLongs.java  |   2 +
 .../PrimitiveLongHolder_actionReturningArray.java  |   3 +-
 ...ngHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/longs/jdo/PrimitiveLongJdo.java      |   6 +-
 .../primitive/longs/jpa/PrimitiveLongJpa.java      |   3 +-
 .../types/primitive/longs/vm/PrimitiveLongVm.java  |   5 +-
 .../PrimitiveShortHolder_actionReturningArray.java |   3 +-
 ...rtHolder_updateReadOnlyPropertyWithChoices.java |   3 +-
 .../primitive/shorts/jdo/PrimitiveShortJdo.java    |   6 +-
 .../primitive/shorts/jpa/PrimitiveShortJpa.java    |   3 +-
 .../primitive/shorts/vm/PrimitiveShortVm.java      |   5 +-
 domain/src/main/resources/application.yml          |   2 +-
 .../featured/customui/WhereInTheWorldPanel.java    |   3 +-
 .../customui/WhereInTheWorldPanelFactory.java      |   2 +-
 wicket/common/pom.xml                              |   2 +-
 .../webapp/wicket/common/DemoAppWicketCommon.java  |   4 +-
 .../featured/customui/WhereInTheWorldPanel.java    |   5 +-
 .../customui/WhereInTheWorldPanelFactory.java      |   2 +-
 998 files changed, 2080 insertions(+), 2623 deletions(-)

diff --cc domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
index d57d53e,8bcf410..1ad63fa
--- a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
+++ b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.resources.AsciiDocReaderService;
++import lombok.RequiredArgsConstructor;
  
  @Property(
          snapshot = Snapshot.EXCLUDED,
diff --cc domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
index 32badcb,26b9a43..682300e
--- a/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
+++ b/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
@@@ -28,11 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
++import demoapp.dom._infra.resources.MarkupVariableResolverService;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom._infra.resources.MarkupVariableResolverService;
--
  @Property(
          snapshot = Snapshot.EXCLUDED,
          domainEvent = HasAsciiDocDescription_sources.DomainEvent.class
diff --cc domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
index b085450,7c4cd42..eaf71fe
--- a/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
+++ b/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocConverterService.java
@@@ -30,7 -30,7 +30,6 @@@ import org.asciidoctor.SafeMode
  import org.asciidoctor.ast.Document;
  import org.asciidoctor.extension.IncludeProcessor;
  import org.asciidoctor.extension.PreprocessorReader;
--
  import org.springframework.stereotype.Service;
  
  import lombok.val;
diff --cc domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
index 316bff5,316bff5..a3d596c
--- a/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
+++ b/domain/src/main/java/demoapp/dom/_infra/samples/EnumSamples.java
@@@ -22,9 -22,9 +22,8 @@@ import java.util.stream.Stream
  
  import org.springframework.stereotype.Service;
  
--import lombok.SneakyThrows;
--
  import demoapp.dom.types.Samples;
++import lombok.SneakyThrows;
  
  @Service
  public class EnumSamples implements Samples<DemoEnum> {
diff --cc domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
index 7e4a400,7e4a400..55bef55
--- a/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
+++ b/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
@@@ -24,9 -24,9 +24,8 @@@ import java.util.stream.Stream
  
  import org.springframework.stereotype.Service;
  
--import lombok.val;
--
  import demoapp.dom.types.Samples;
++import lombok.val;
  
  @Service
  public class NameSamples implements Samples<String> {
diff --cc domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
index 0ffad5d,751839a..c16b4e9
--- a/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
+++ b/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
@@@ -26,11 -26,11 +26,10 @@@ import org.apache.causeway.applib.event
  import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
  import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
  
--import lombok.NonNull;
--
  import demoapp.dom._infra.values.ValueHolder;
  import demoapp.dom._infra.values.ValueHolderFixtureFactory;
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.NonNull;
  
  public abstract class SeedServiceAbstract
  implements
diff --cc domain/src/main/java/demoapp/dom/_infra/utils/LogUtils.java
index 4c1ee8f,4c1ee8f..69fe8bf
--- a/domain/src/main/java/demoapp/dom/_infra/utils/LogUtils.java
+++ b/domain/src/main/java/demoapp/dom/_infra/utils/LogUtils.java
@@@ -25,9 -25,9 +25,9 @@@ public class LogUtils 
  
      public static String emphasize(String string) {
          return new StringBuilder()
--                .append("\n====================================================\n")
++                .append("\n===\n")
                  .append(string)
--                .append("\n====================================================\n")
++                .append("\n===\n")
                  .toString();
      }
  
diff --cc domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
index ab37367,f15f2f4..fe704d1
--- a/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/_changes/ChangesVm.java
@@@ -37,8 -37,6 +37,7 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.jaxb.JavaTimeXMLGregorianCalendarMarshalling;
  import org.apache.causeway.schema.chg.v2.ChangesDto;
  
 +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
  import lombok.AllArgsConstructor;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
diff --cc domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
index 19a9a3f,e76f1d2..0a9573b
--- a/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
+++ b/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_clear.java
@@@ -24,9 -24,9 +24,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ActionLayout;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingPage;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
index 5ea5fc0,0000000..26bca7c
mode 100644,000000..100644
--- a/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
@@@ -1,90 -1,0 +1,89 @@@
 +/*
 + *  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._interactions;
 +
 +import java.text.SimpleDateFormat;
 +import java.util.Date;
 +
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +
 +import org.apache.causeway.applib.ViewModel;
 +import org.apache.causeway.applib.annotation.DomainObject;
 +import org.apache.causeway.applib.annotation.LabelPosition;
 +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.services.urlencoding.UrlEncodingService;
 +import org.apache.causeway.applib.util.TitleBuffer;
 +import org.apache.causeway.applib.util.schema.InteractionDtoUtils;
 +import org.apache.causeway.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression;
 +import org.apache.causeway.schema.ixn.v2.InteractionDto;
 +
 +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.AllArgsConstructor;
 +import lombok.Getter;
 +import lombok.NoArgsConstructor;
 +import lombok.Setter;
 +import lombok.val;
 +
 +//tag::class[]
 +@Named("demo.InteractionDtoVm")
 +@DomainObject(
 +        nature = Nature.VIEW_MODEL)
 +@NoArgsConstructor
 +@AllArgsConstructor
 +public class InteractionDtoVm implements ViewModel, HasAsciiDocDescription {
 +
 +    private final static UrlEncodingService encodingService = new UrlEncodingServiceWithCompression();
 +
 +    @ObjectSupport public String title() {
 +        // nb: not thread-safe
 +        // formats defined in https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
 +        val format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 +        val exec = getInteractionDto().getExecution();
 +        val instant = exec.getMetrics().getTimings().getStartedAt().toGregorianCalendar().toInstant();
 +
 +        val buf = new TitleBuffer();
 +        buf.append(format.format(Date.from(instant)));
 +        buf.append(" ").append(exec.getLogicalMemberIdentifier());
 +        return buf.toString();
 +    }
 +
 +
 +    @Property
 +    @PropertyLayout(labelPosition = LabelPosition.NONE)
 +    @Getter @Setter
 +    private InteractionDto interactionDto;
 +
 +    // -- VIEWMODEL CONTRACT
 +
 +    @Inject
 +    public InteractionDtoVm(final String memento) {
 +        interactionDto = InteractionDtoUtils.dtoMapper().read(encodingService.decodeToString(memento));
 +    }
 +
 +    @Override
 +    public String viewModelMemento() {
 +        return encodingService.encodeString(InteractionDtoUtils.dtoMapper().toString(interactionDto));
 +    }
 +
 +}
 +//end::class[]
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
index 2c44d0b,445ef7e..c96f981
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java
@@@ -28,9 -28,9 +28,6 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--import lombok.val;
--
  import demoapp.dom._infra.samples.NameSamples;
  import demoapp.dom.domain.actions.Action.choicesFrom.ActionChoicesFromPage;
  import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingPage;
@@@ -40,6 -40,6 +37,8 @@@ import demoapp.dom.domain.actions.Actio
  import demoapp.dom.domain.actions.Action.semantics.ActionSemanticsPage;
  import demoapp.dom.domain.actions.Action.typeOf.ActionTypeOfPage;
  import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
++import lombok.RequiredArgsConstructor;
++import lombok.val;
  
  @Named("demo.ActionMenu")
  @DomainService(nature=NatureOfService.VIEW)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
index cfdadeb,933cef3..8ab11c1
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.ActionChoicesFromPage")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
index 73f1017,b4e085b..4745f08
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/ActionChoicesFromPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
index a6d0bff,dae1f2e..df19f5c
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jdo/ActionChoicesFromEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.actions.Action.choicesFrom.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.actions.Action.choicesFrom.ActionChoicesFromEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.Action.choicesFrom.ActionChoicesFromEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
          identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
index 0a5a38d,a270b51..98e2ddc
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/choicesFrom/jpa/ActionChoicesFromEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.actions.Action.choicesFrom.ActionChoicesFromEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.Action.choicesFrom.ActionChoicesFromEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
index d2f4bb0,0e599ca..ed91bb0
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.ActionCommandPublishingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
index b59583a,c81a2b6..ed526ab
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
index bbba4df,5af1296..b18027b
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.actions.Action.commandPublishing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
index 27fbf0e,6920f58..eb6541b
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
index e3a9a48,ea9c2ce..e1c0659
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.ActionDomainEventPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-asterisk")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
index 98cfeeb,c7c1fd3..89638a5
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.ActionExecutionPublishingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
index 4e7b128,aac5808..0cdbc70
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
index b17f9e0,f45b3e2..496b2bd
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.actions.Action.executionPublishing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
index 75e7504,5c9a164..a995d87
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
index 656e3b6,fe260b2..86385b2
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.RestrictTo;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.ActionRestrictToPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-paper-plane")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
index 668db83,d380410..d0cd654
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
@@@ -43,12 -43,12 +43,11 @@@ import org.apache.causeway.applib.servi
  
  import static org.apache.causeway.applib.services.wrapper.control.SyncControl.control;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.ActionSemanticsVm")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-skull-crossbones")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
index 79c05d3,6a21f14..5c438d0
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
@@@ -37,11 -37,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.Getter;
--import lombok.NoArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm;
++import lombok.Getter;
++import lombok.NoArgsConstructor;
  
  @Named("demo.ActionTypeOfPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
index 44a7fed,b053984..07e7359
--- a/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "child")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
index dbcfd9a,32b5ff6..90c45c2
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java
@@@ -28,9 -28,9 +28,6 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--import lombok.val;
--
  import demoapp.dom._infra.samples.NameSamples;
  import demoapp.dom.domain.actions.ActionLayout.associateWith.ActionLayoutAssociateWithPage;
  import demoapp.dom.domain.actions.ActionLayout.associateWith.child.ActionLayoutAssociateWithChildVm;
@@@ -44,6 -44,6 +41,8 @@@ import demoapp.dom.domain.actions.Actio
  import demoapp.dom.domain.actions.ActionLayout.promptStyle.ActionLayoutPromptStylePage;
  import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyPage;
  import demoapp.dom.domain.actions.ActionLayout.sequence.ActionLayoutSequencePage;
++import lombok.RequiredArgsConstructor;
++import lombok.val;
  
  @DomainService(nature=NatureOfService.VIEW)
  @Named("demo.ActionLayoutMenu")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
index 00df42e,5f484d2..fddf5ef
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
@@@ -37,13 -37,13 +37,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.actions.ActionLayout.associateWith.child.ActionLayoutAssociateWithChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.actions.ActionLayout.associateWith.child.ActionLayoutAssociateWithChildVm;
--
  @Named("demo.ActionLayoutAssociateWithPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-solid fa-arrows-left-right")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
index b03e7a9,18f0f0d..cdd8c4b
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/child/ActionLayoutAssociateWithChildVm.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "child")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
index 7a5d990,1e69d9a..7fa08b6
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.ActionLayoutCssClassVm")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
index e14633f,806783f..beeaf7d
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.layout.component.CssClassFaPosition;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.ActionLayoutCssClassFaVm")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
index 586b38e,0833bac..18e850b
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
@@@ -39,13 -39,13 +39,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.actions.ActionLayout.describedAs.child.ActionLayoutDescribedAsChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.actions.ActionLayout.describedAs.child.ActionLayoutDescribedAsChildVm;
--
  @Named("demo.ActionLayoutDescribedAsPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-comment")
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
index 4a2b479,98b76f7..570b3c9
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "child")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
index 644eccc,638d95d..68113dd
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import lombok.NoArgsConstructor;
  
  @Named("demo.ActionLayoutHiddenPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
index f2d1e77,c021951..c237c15
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
index 1c8765f,9016250..76d70de
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jdo/ActionLayoutHiddenEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.actions.ActionLayout.hidden.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
index 078f110,f21df18..f2fb40e
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/jpa/ActionLayoutHiddenEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.actions.ActionLayout.hidden.ActionLayoutHiddenEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
index 161417b,fd3a9ef..785a87a
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
@@@ -34,8 -34,6 +34,7 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
index c062213,52c4a02..50feab2
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.ActionLayoutPositionPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
index dc9a3ed,054fb1d..6cebb88
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  @Named("demo.ActionLayoutRedirectPolicyPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
index cc8965f,2500db6..8d424c9
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/jdo/ActionLayoutRedirectPolicyEntityImpl.java
@@@ -18,7 -18,7 +18,6 @@@
   */
  package demoapp.dom.domain.actions.ActionLayout.redirectPolicy.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
@@@ -26,6 -26,6 +25,8 @@@ import javax.jdo.annotations.IdentityTy
  import javax.jdo.annotations.PersistenceCapable;
  import javax.jdo.annotations.Persistent;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
index 736320c,68b56eb..30a3a94
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqX.java
@@@ -18,9 -18,7 +18,7 @@@
   */
  package demoapp.dom.domain.actions.ActionLayout.sequence;
  
- import lombok.RequiredArgsConstructor;
- 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
index e338c52,b697507..078a1ce
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage_noopSeqY.java
@@@ -18,9 -18,7 +18,7 @@@
   */
  package demoapp.dom.domain.actions.ActionLayout.sequence;
  
- import lombok.RequiredArgsConstructor;
- 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
index 37c11f7,366d3b3..5595e08
--- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/child/ActionLayoutSequenceChildVm.java
@@@ -18,17 -18,25 +18,24 @@@
   */
  package demoapp.dom.domain.actions.ActionLayout.sequence.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 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 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 demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  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
diff --cc domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
index d2f5156,42850a8..9436e53
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventPage.java
@@@ -36,13 -36,13 +36,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
--
  @Named("demo.CollectionDomainEventVm")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-asterisk")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
index 92ee149,0f216af..e6fad46
--- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "demo.CollectionDomainEventChildVm")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
index d719eb6,855300f..c8dde41
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
@@@ -36,13 -36,13 +36,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.collections.CollectionLayout.cssClass.child.CollectionLayoutCssClassChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.collections.CollectionLayout.cssClass.child.CollectionLayoutCssClassChildVm;
--
  //tag::class[]
  @Named("demo.CollectionLayoutCssClassPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
index 7383df0,d643d04..2bf5a86
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/child/CollectionLayoutCssClassChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutCssClassChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutCssClassChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
index 5f7655c,eac3aa4..1d4210e
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
@@@ -36,13 -36,13 +36,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.collections.CollectionLayout.defaultView.child.CollectionLayoutDefaultViewChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.collections.CollectionLayout.defaultView.child.CollectionLayoutDefaultViewChildVm;
--
  //tag::class[]
  @Named("demo.CollectionLayoutDefaultViewPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
index ee45019,b5fda85..6f21ba0
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/child/CollectionLayoutDefaultViewChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutDefaultViewChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutDefaultViewChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
index 66639d5,3e5c479..e90b2d5
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/child/CollectionLayoutDescribedAsChildVm.java
@@@ -18,20 -18,24 +18,23 @@@
   */
  package demoapp.dom.domain.collections.CollectionLayout.describedAs.child;
  
- import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
- import lombok.Getter;
- import lombok.NoArgsConstructor;
- import lombok.Setter;
- 
 -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 jakarta.inject.Named;
- import jakarta.xml.bind.annotation.*;
++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 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.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+ import lombok.Getter;
+ import lombok.NoArgsConstructor;
+ import lombok.Setter;
+ 
 -import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 -
  //tag::class[]
  @Named("demo.CollectionLayoutDescribedAsChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutDescribedAsChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
index 7b1c121,bec2a25..a934b93
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/child/CollectionLayoutHiddenChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutHiddenChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutHiddenChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
index d2da1e8,8143437..13c6712
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/child/CollectionLayoutNamedChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutNamedChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutNamedChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
index a21edd7,6808269..7a5e621
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/child/CollectionLayoutPagedChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutPagedChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutPagedChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
index 48eda98,20fa46a..3d27e29
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/child/CollectionLayoutSequenceChildVm.java
@@@ -18,20 -18,24 +18,23 @@@
   */
  package demoapp.dom.domain.collections.CollectionLayout.sequence.child;
  
- import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
- import lombok.Getter;
- import lombok.NoArgsConstructor;
- import lombok.Setter;
- 
 -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 jakarta.inject.Named;
- import jakarta.xml.bind.annotation.*;
++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 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.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+ import lombok.Getter;
+ import lombok.NoArgsConstructor;
+ import lombok.Setter;
+ 
 -import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 -
  //tag::class[]
  @Named("demo.CollectionLayoutSequenceChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutSequenceChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
index 6d080af,e65649a..94a8cc4
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
@@@ -36,14 -36,13 +36,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 +import demoapp.dom.domain.collections.CollectionLayout.sortedBy.child.CollectionLayoutSortedByChildVm;
- 
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 -import demoapp.dom.domain.collections.CollectionLayout.sortedBy.child.CollectionLayoutSortedByChildVm;
--
  //tag::class[]
  @Named("demo.CollectionLayoutSortedByPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
index 13be2fc,fd30eff..40cc984
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/child/CollectionLayoutSortedByChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutSortedByChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutSortedByChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
index d2e3c44,17d7559..c80a846
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/CollectionLayoutTableDecoratorPage.java
@@@ -37,13 -37,13 +37,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.TableDecorator;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.collections.CollectionLayout.tabledec.child.CollectionLayoutTableDecoratorChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.collections.CollectionLayout.tabledec.child.CollectionLayoutTableDecoratorChildVm;
--
  //tag::class[]
  @Named("demo.CollectionLayoutTableDecoratorPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
index c5c189d,29c0b4b..d09d479
--- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tabledec/child/CollectionLayoutTableDecoratorChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.CollectionLayoutTableDecoratorChildVm")
  @XmlRootElement(name = "demo.CollectionLayoutTableDecoratorChildVm")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
index f0043e9,4d255d8..fcf4cf0
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
@@@ -29,9 -29,9 +29,6 @@@ import org.apache.causeway.applib.annot
  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;
@@@ -42,6 -42,6 +39,8 @@@ import demoapp.dom.domain.objects.Domai
  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)
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
index 8804011,1a314d5..299e5b1
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  @XmlRootElement(name = "root")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
index 9cf4d7d,db9d407..c5aca64
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
index 6208f93,1924c86..aacb54a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jdo/DomainObjectAliasedEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.aliased.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
index 5edd257,67e585a..88feab3
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/jpa/DomainObjectAliasedEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.aliased.DomainObjectAliasedEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
index ad35047,41bb607..f9467e4
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  @Named("demo.DomainObjectAutoCompleteVm")
  @DomainObject(nature = Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
index fb8fa6d,dec08e7..c03580f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/jdo/DomainObjectAutoCompleteEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.autoComplete.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
index effe62c,2a333d8..3d56df4
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectBoundingVm")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
index 50e6aa1,9deadfb..70044e2
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
index 1738011,1b6197d..c617d27
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingEntityImpl.java
@@@ -18,23 -18,23 +18,23 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.bounded.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Bounding;
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingPage_find.java
index 1f1dbeb,1f1dbeb..11cb2e2
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingPage_find.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jdo/DomainObjectBoundingPage_find.java
@@@ -6,9 -6,9 +6,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingPage;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Profile("demo-jdo")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
index 8e0a866,3fe4ecd..981da27
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingEntityImpl.java
@@@ -32,12 -32,12 +32,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingPage_find.java
index 0ee6d34,0ee6d34..7592b53
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingPage_find.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/jpa/DomainObjectBoundingPage_find.java
@@@ -6,9 -6,9 +6,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.bounded.DomainObjectBoundingPage;
++import lombok.RequiredArgsConstructor;
  
  @Profile("demo-jpa")
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
index b912e99,ce87244..6273aa3
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Editing;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectEditingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
index 8501158,8e61132..ee283f9
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
index 0ed0bf3,ea4ac80..b7f23f4
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jdo/DomainObjectEditingEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.editing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -31,11 -31,11 +32,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom.domain.objects.DomainObject.editing.DomainObjectEditingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.editing.DomainObjectEditingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
index 65f6ea3,8483aeb..de3449a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/jpa/DomainObjectEditingEntityImpl.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.editing.DomainObjectEditingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.editing.DomainObjectEditingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity_updatePropertyUsingAction.java
index 1111e1e,1111e1e..1ce1713
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity_updatePropertyUsingAction.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity_updatePropertyUsingAction.java
@@@ -23,9 -23,9 +23,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
index c007c08,f69591f..42526a8
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage.java
@@@ -29,10 -29,10 +29,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom.domain._changes.ExposeCapturedChanges;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectEntityChangePublishingVm")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
index 530f821,f384167..97c5271
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_modify.java
@@@ -29,10 -29,10 +29,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.applib.services.repository.RepositoryService;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.NameSamples;
  import demoapp.dom._infra.values.ValueHolderRepository;
- 
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
index f73b58a,d548813..56e9c6a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingPage_objects.java
@@@ -26,9 -26,9 +26,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
index 00f0fd1,0f93936..6c7f719
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jdo/DomainObjectEntityChangePublishingEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  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;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -31,11 -31,11 +32,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Publishing;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
index da5ad79,07a7fcc..d3d3e50
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/jpa/DomainObjectEntityChangePublishingEntityImpl.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
index 319d50b,78c9436..a534148
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Introspection;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectIntrospectionVm")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
index da63e89,acb6b33..b0d7df0
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationOptional.java
@@@ -26,10 -26,10 +26,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.DomainObjectIntrospectionAnnotOptEntity;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
index 5c70135,319d885..71260df
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage_annotationRequired.java
@@@ -26,10 -26,10 +26,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.DomainObjectIntrospectionAnnotReqdEntity;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
index 46bba4e,35d5476..4354c34
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jdo/DomainObjectIntrospectionAnnotOptEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
index 9f4273d,fa71c43..3d9bae3
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotOpt/jpa/DomainObjectIntrospectionAnnotOptEntityImpl.java
@@@ -31,9 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Introspection;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.introspection.annotOpt.DomainObjectIntrospectionAnnotOptEntity;
++import lombok.NoArgsConstructor;
  
  @Profile("demo-jpa")
  @Entity
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
index 6303dc7,390d981..76b414f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jdo/DomainObjectIntrospectionAnnotReqdEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Action;
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
index 848c503,d7d2ef1..234fb93
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/annotReqd/jpa/DomainObjectIntrospectionAnnotReqdEntityImpl.java
@@@ -34,9 -34,9 +34,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.introspection.annotReqd.DomainObjectIntrospectionAnnotReqdEntity;
++import lombok.NoArgsConstructor;
  
  @Profile("demo-jpa")
  @Entity
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
index c8d550e,f1cac71..35a651f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jdo/DomainObjectIntrospectionEncapsulatedEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Action;
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
index 9b0e637,20a261c..e041106
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/encapsulated/jpa/DomainObjectIntrospectionEncapsulatedEntityImpl.java
@@@ -35,9 -35,9 +35,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom.domain.objects.DomainObject.introspection.encapsulated.DomainObjectIntrospectionEncapsulatedEntity;
++import lombok.NoArgsConstructor;
  
  @Profile("demo-jpa")
  @Entity
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
index 98934bf,e7d998e..e83fef3
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectMixinMethodVm")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
index 846eb0e,bae56f1..e8bafe5
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.DomainObject;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @DomainObject(mixinMethod = "collection")                               // <.>
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
index 014ba58,8c039c6..de4c815
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage_updateName.java
@@@ -9,9 -9,9 +9,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ActionLayout;
  import org.apache.causeway.applib.annotation.DomainObject;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @DomainObject(mixinMethod = "action")                   // <.>
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
index c0763d5,5a4cb51..6821f41
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jdo/DomainObjectMixinMethodEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.mixinMethod.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMethodEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMethodEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
index 21ddc11,478947b..9b6b9af
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/jpa/DomainObjectMixinMethodEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMethodEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMethodEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
index 4d75675,3efe141..25051e1
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectNaturePage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
index eeff09e,81d3f7f..0fbed54
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_entities.java
@@@ -6,10 -6,10 +6,9 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Collection;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
index 0624c84,2ddaf3b..869d4fd
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage_viewModels.java
@@@ -7,11 -7,11 +7,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Collection;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
  import demoapp.dom.domain.objects.DomainObject.nature.viewmodel.DomainObjectNatureViewModel;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
index e38c929,2b8f9ae..c127987
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jdo/DomainObjectNatureEntityImpl.java
@@@ -18,23 -18,23 +18,23 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.nature.entity.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 javax.persistence.Column;
++
++import jakarta.inject.Named;
 +import jakarta.persistence.Column;
  
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(                                // <.>
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
index 8a6d76c,4b7a08b..5a5f203
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/entity/jpa/DomainObjectNatureEntityImpl.java
@@@ -32,12 -32,12 +32,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity                                             // <.>
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
index 33eb9d4,da40f49..6350d17
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodel/DomainObjectNatureViewModel.java
@@@ -35,13 -35,13 +35,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  import org.apache.causeway.applib.services.title.TitleService;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.objects.DomainObject.nature.entity.DomainObjectNatureEntity;
--
  //tag::class[]
  @XmlRootElement(name = "root")                              // <.>
  @XmlType(propOrder = {"message", "underlying"})             // <1>
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
index 9d8291f,c4fdb00..b6e45ab
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java
@@@ -43,13 -43,13 +43,12 @@@ import org.apache.causeway.applib.event
  import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
  import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.child.DomainObjectXxxDomainEventChildVm;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.child.DomainObjectXxxDomainEventChildVm;
--
  @XmlRootElement(name = "root")
  @XmlType
  @XmlAccessorType(XmlAccessType.FIELD)
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
index c9ddb80,7f1ebcf..812b66f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/child/DomainObjectXxxDomainEventChildVm.java
@@@ -30,12 -30,12 +30,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "demo.DomainObjectXxxDomainEventChildVm")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
index b2fa7d9,8097a49..905ab53
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectLifecycleEventVm.java
@@@ -18,12 -18,14 +18,14 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent;
  
+ import java.time.LocalDateTime;
+ 
 -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 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 org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
@@@ -31,14 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.jaxb.JavaTimeJaxbAdapters.LocalDateTimeToStringAdapter;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
- import java.time.LocalDateTime;
--
  //tag::class[]
  @XmlRootElement(name = "demo.DomainObjectLifecycleEventVm")
  @XmlType
@@@ -48,7 -48,7 +47,7 @@@
  @NoArgsConstructor
  public class DomainObjectLifecycleEventVm implements HasAsciiDocDescription {
  
--    public DomainObjectLifecycleEventVm(LocalDateTime timestamp, String eventType, String bookmark) {
++    public DomainObjectLifecycleEventVm(final LocalDateTime timestamp, final String eventType, final String bookmark) {
          this.eventType = eventType;
          this.bookmark = bookmark;
          this.timestamp = timestamp;
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
index bc51e61,9424adb..5ea135a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
@@@ -32,12 -32,12 +32,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.DomainObjectXxxLifecycleEventPage")
  @DomainObject(nature = Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
index 5e15f4a,0c6ffe3..027351a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_createEntity.java
@@@ -24,11 -24,11 +24,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--import lombok.val;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
++import lombok.val;
  
  
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
index 23c6c13,57b26b0..a4ec23c
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage_deleteEntity.java
@@@ -24,9 -24,9 +24,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
index 7260f7a,056d938..bd3a705
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventSubscriber.java
@@@ -21,10 -21,8 +21,8 @@@ package demoapp.dom.domain.objects.Doma
  import java.util.LinkedList;
  import java.util.List;
  
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
- import org.apache.causeway.applib.services.clock.ClockService;
- 
  import org.springframework.context.event.EventListener;
  import org.springframework.stereotype.Service;
  
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
index 2422311,119ee2f..2b64f9a
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jdo/DomainObjectXxxLifecycleEventEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
index 93d40d9,2eb05c1..bb509f0
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
index 84fa384,86dccbf..6a2f3e8
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  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.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "child")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
index 5067115,903e00a..6bf63a8
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
@@@ -31,9 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @XmlRootElement(name = "root")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
index d8aa623,a91133e..0d33fc5
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
index c715b1b,a8a2a09..cba7d53
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarking_addChildren.java
@@@ -25,11 -25,11 +25,10 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
++import demoapp.dom.types.Samples;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom.types.Samples;
--
  @Action
  @RequiredArgsConstructor
  public class DomainObjectLayoutBookmarking_addChildren {
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
index 6e53f3e,05fc4cc..e24a65c
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingChildEntityImpl.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.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 javax.persistence.FetchType;
 -import javax.persistence.ManyToOne;
++
++import jakarta.inject.Named;
 +import jakarta.persistence.FetchType;
 +import jakarta.persistence.ManyToOne;
  
  import org.springframework.context.annotation.Profile;
  
@@@ -32,11 -32,11 +33,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingChildEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingChildEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
index 9e538d1,3372a0e..b8f65db
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jdo/DomainObjectLayoutBookmarkingEntityImpl.java
@@@ -21,24 -21,24 +21,24 @@@ package demoapp.dom.domain.objects.Doma
  import java.util.Set;
  import java.util.TreeSet;
  
- 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 javax.jdo.annotations.Persistent;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Collection;
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
index ca4e5ab,2332e82..3bdda92
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingChildEntityImpl.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingChildEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingChildEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
index b57eaab,44c765a..e674f13
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/jpa/DomainObjectLayoutBookmarkingEntityImpl.java
@@@ -37,12 -37,12 +37,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.bookmarking.DomainObjectLayoutBookmarkingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
index 3ab2db9,80e3253..241f003
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @XmlRootElement(name = "root")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
index 0c0aec2,608a0dd..2a4dec6
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
index 6c07f8a,daf016e..7e5c362
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jdo/DomainObjectLayoutCssClassEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.cssClass.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClassEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClassEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
index e5b3d76,ac2d2dd..65de48b
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/jpa/DomainObjectLayoutCssClassEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClassEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.cssClass.DomainObjectLayoutCssClassEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
index d1ecc46,bc4e090..6a67d9f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectLayoutCssClassFaPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
index e7072f7,74e3ca1..576975c
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
index 422e3d6,fe05384..1731ab6
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jdo/DomainObjectLayoutCssClassFaEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.DomainObjectLayoutCssClassFaEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.DomainObjectLayoutCssClassFaEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
index 62b72f8,ff81506..822563f
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.DomainObjectLayoutCssClassFaEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa.DomainObjectLayoutCssClassFaEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
index 08dda01,51dbd42..db9c35c
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectLayoutDescribedAsPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
index 68645bf,f61d781..3192add
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
index f44b6ee,2cedf67..d3f092c
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jdo/DomainObjectLayoutDescribedAsEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.describedAs.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.describedAs.DomainObjectLayoutDescribedAsEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.describedAs.DomainObjectLayoutDescribedAsEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
index b4ca9d3,38b38af..6e3b8f4
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.describedAs.DomainObjectLayoutDescribedAsEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.describedAs.DomainObjectLayoutDescribedAsEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
index d32ba6c,ed3ffd3..b7b92f8
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectLayoutNamedPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
index 7a62021,553aeaa..d656be4
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
index c1b8dc9,41dc8dd..be5d8a7
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jdo/DomainObjectLayoutNamedEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.named.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.named.DomainObjectLayoutNamedEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.named.DomainObjectLayoutNamedEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
index 1baa1fb,fbd72a1..7083f0e
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.named.DomainObjectLayoutNamedEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.named.DomainObjectLayoutNamedEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
index fbce174,b3f2b59..1d87442
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectLayoutPagedPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
index 07c3aa7,a077af1..23da238
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Action()
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
index fa3a50b,d893fd9..4c3d5f6
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
index 0cbb31d,b224057..dd62acd
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jdo/DomainObjectLayoutPagedEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.paged.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.paged.DomainObjectLayoutPagedEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.paged.DomainObjectLayoutPagedEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
index e7628b8,2c5ca2b..5d6f942
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.paged.DomainObjectLayoutPagedEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.paged.DomainObjectLayoutPagedEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
index e274095,4b2ec59..5f82643
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_actionReturningObjects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Action()
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
index 005e685,92ce8b0..1a8a7f5
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
index 3ac171c,6f49d68..0ca1116
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jdo/DomainObjectLayoutTableDecoratorEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.tabledec.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -31,11 -31,11 +32,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.TableDecorator;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.DomainObjectLayoutTableDecoratorEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.DomainObjectLayoutTableDecoratorEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
index 8f6477a,359bb78..60f8fa0
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/jpa/DomainObjectLayoutTableDecoratorEntityImpl.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.TableDecorator;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.DomainObjectLayoutTableDecoratorEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.DomainObjectLayoutTableDecoratorEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
index 8c639f7,c79632a..5d3f481
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.DomainObjectLayoutXxxUiEventPage")
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
index 22f99e1,f79d2f5..6eef32d
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
index d228c41,caff456..79c5893
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jdo/DomainObjectLayoutXxxUiEventEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayoutXxxUiEventEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayoutXxxUiEventEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
index 171b515,9a106ba..6a0fac9
--- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/jpa/DomainObjectLayoutXxxUiEventEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayoutXxxUiEventEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.DomainObjectLayoutXxxUiEventEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
index 1738d70,412338c..7c32658
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java
@@@ -32,11 -32,9 +32,6 @@@ import org.apache.causeway.applib.annot
  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;
@@@ -51,6 -50,6 +47,8 @@@ import demoapp.dom.domain.properties.Pr
  import demoapp.dom.domain.properties.Property.regexPattern.PropertyRegexPatternPage;
  import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotPage;
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
++import lombok.val;
  
  @Named("demo.PropertyMenu")
  @DomainService(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
index 20816de,e637a6e..8ebc464
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.PropertyCommandPublishingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
index 31810e5,b809483..4e8b203
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
index aafd1ce,04d221d..c56f24c
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.properties.Property.commandPublishing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
index 3c039ab,d808014..4406964
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
index 4fb02cd,6a61b9b..1c9d6d0
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.events.domain.PropertyDomainEvent;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyDomainEventPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
index 82e3bd4,dda550b..f456015
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
@@@ -30,9 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.PropertyEditingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
index 1744a37,07aacd5..2c8b0ee
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage_objects.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
index 7be97ab,11d45be..75c6ba5
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jdo/PropertyEditingEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.properties.Property.editing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -31,11 -31,11 +32,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom.domain.properties.Property.editing.PropertyEditingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.editing.PropertyEditingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
index f4b6f1a,3f131e4..6592e4b
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/jpa/PropertyEditingEntityImpl.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.Property.editing.PropertyEditingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.editing.PropertyEditingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
index 6dff9ff,e132b4b..cdf8ab9
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.PropertyExecutionPublishingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
index 2cc0b21,09fa78c..a89e205
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
index 987bb3c,2f38877..7c79e72
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingEntityImpl.java
@@@ -18,22 -18,22 +18,22 @@@
   */
  package demoapp.dom.domain.properties.Property.executionPublishing.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Nature;
  
++import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
index 6f9345a,c43521b..c352ab6
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingEntityImpl.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
index 691a879,a6673b0..384455a
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.value.Blob;
  import org.apache.causeway.applib.value.Clob;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyFileAcceptPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
index c841301,8964c56..b9f2da9
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingChildVm.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @XmlRootElement(name = "child")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
index 0f34bb9,c28aaeb..49123ca
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
@@@ -37,12 -37,12 +37,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyProjectingVm")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
index 6b2d29c,aee6cf4..7877d5e
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  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 javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++
++import jakarta.inject.Named;
 +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  
  import org.springframework.context.annotation.Profile;
  
@@@ -34,11 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  
++import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
index dfd4dda,9d0c10d..08ca52e
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildEntityImpl.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.projecting.PropertyProjectingChildEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
index 33539b4,650b951..c3c28fc
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyRegexPatternPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
index abc4de6,d380fc5..f088d4d
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.Snapshot;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.PropertySnapshotPage")
  @DomainObject(
      nature=Nature.VIEW_MODEL,
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
index cb0a5b5,31377f2..7ea2a86
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotPage_friends.java
@@@ -8,9 -8,9 +8,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.CollectionLayout;
  import org.apache.causeway.applib.annotation.MemberSupport;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
++import lombok.RequiredArgsConstructor;
  
  @Collection()
  @CollectionLayout()
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
index 424a8a9,3df0fd0..1289856
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jdo/PropertySnapshotEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.properties.Property.snapshot.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
index 73fdaf7,52d36ee..9e2fb8c
--- a/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/jpa/PropertySnapshotEntityImpl.java
@@@ -32,12 -32,12 +32,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
index 3408f45,f0d000d..d80c9db
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutCssClassPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
index 943c127,393cddf..748cc68
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutDescribedAsPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
index 516e69d,767ed9a..ac0e638
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
++import lombok.NoArgsConstructor;
  
  @Named("demo.PropertyLayoutHiddenPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
index 777de6c,60cf0aa..ffa3948
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage_objects.java
@@@ -7,9 -7,9 +7,8 @@@ import jakarta.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;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Collection()
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
index 881599e,b32ed31..ad6b2c2
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jdo/PropertyLayoutHiddenEntityImpl.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.domain.properties.PropertyLayout.hidden.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -32,11 -32,11 +33,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Where;
  
++import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
index 06d2ba1,e7db54f..a8b9070
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/jpa/PropertyLayoutHiddenEntityImpl.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Where;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.domain.properties.PropertyLayout.hidden.PropertyLayoutHidden;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
index 9cdff8d,a0a47c3..0cb1e57
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutLabelPositionVm")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
index 09fe57a,6c3903e..89ff8ce
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutMultiLinePage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
index c005035,71d90ce..482f34c
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutNamedPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
index 1dbd0e4,43a7fcc..7c44b3e
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.PropertyLayoutRepaintingPage")
diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
index 845d358,7e00a0b..00498ba
--- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
@@@ -34,12 -34,12 +34,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.PropertyLayoutTypicalLengthPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
index eceb30d,da8a063..678b3f3
--- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
+++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java
@@@ -21,11 -21,9 +21,9 @@@ package demoapp.dom.domain.properties.V
  import java.math.BigDecimal;
  import java.time.LocalDate;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
- import demoapp.dom.domain.properties.ValueSemantics.percentage.ValueSemanticsProviderPercentagePage;
- 
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
  import org.apache.causeway.applib.annotation.DomainService;
@@@ -33,9 -31,11 +31,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -import lombok.val;
 -
  import demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays.ValueSemanticsDateRenderAdjustDaysPage;
+ import demoapp.dom.domain.properties.ValueSemantics.percentage.ValueSemanticsProviderPercentagePage;
 +import lombok.RequiredArgsConstructor;
 +import lombok.val;
  
  @Named("demo.ValueSemanticsMenu")
  @DomainService(
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
index b491305,609c5dd..a3b2df1
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsPage.java
@@@ -39,16 -39,15 +39,14 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.featured.causewayext.cal.persistence.CausewayCalendarEventEntity;
  import demoapp.dom.featured.causewayext.cal.vm.CausewayCalendarEventVm;
  import demoapp.dom.types.Samples;
- 
 +import lombok.NoArgsConstructor;
  
  @Named("demo.CausewayCalendarEvents")
  @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
index d821afd,353a8bf..136fcaa
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 5d7c2ef,b6e99e1..681850d
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
index fc694ca,2655350..4aa4aae
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/holder/CausewayCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
index 00a159f,6dbd787..6cef0c3
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jdo/CausewayCalendarEventJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.featured.causewayext.cal.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -33,10 -33,8 +34,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
 +import demoapp.dom.featured.causewayext.cal.persistence.CausewayCalendarEventEntity;
  import lombok.Getter;
  import lombok.Setter;
  
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
index a597098,95303fc..9b6405c
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/jpa/CausewayCalendarEventJpa.java
@@@ -34,11 -34,9 +34,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
+ import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
 +import demoapp.dom.featured.causewayext.cal.persistence.CausewayCalendarEventEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
index 74befc5,5a48f45..a4ec4d1
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/vm/CausewayCalendarEventVm.java
@@@ -32,15 -32,14 +32,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- 
  import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
  
 -import lombok.Getter;
 -import lombok.Setter;
 -
+ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom.featured.causewayext.cal.holder.CausewayCalendarEventHolder2;
 +import lombok.Getter;
 +import lombok.Setter;
  
- import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
  //tag::class[]
  @XmlRootElement(name = "root")
  @XmlType
diff --cc domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
index 2079339,4abe6dd..f3fee06
--- a/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/customui/WhereInTheWorldPage.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.WhereInTheWorldPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
index 6133eb6,82b287d..092cf51
--- a/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
+++ b/domain/src/main/java/demoapp/dom/featured/layout/tooltip/TooltipPage.java
@@@ -50,12 -50,12 +50,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.services.message.MessageService;
  import org.apache.causeway.applib.value.Markup;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.Tooltip")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-comment")
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
index 76598d8,40b56e5..3c6324c
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java
@@@ -18,18 -18,22 +18,21 @@@
   */
  package demoapp.dom.progmodel.actions.autocomplete;
  
- import demoapp.dom.progmodel.actions.TvCharacterPopulator;
- 
- import lombok.RequiredArgsConstructor;
- import lombok.val;
- 
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
- import org.apache.causeway.applib.annotation.*;
+ import org.apache.causeway.applib.annotation.Action;
+ import org.apache.causeway.applib.annotation.ActionLayout;
+ import org.apache.causeway.applib.annotation.DomainService;
+ import org.apache.causeway.applib.annotation.NatureOfService;
+ import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.services.factory.FactoryService;
  
++import demoapp.dom.progmodel.actions.TvCharacterPopulator;
+ import lombok.RequiredArgsConstructor;
+ import lombok.val;
+ 
 -import demoapp.dom.progmodel.actions.TvCharacterPopulator;
 -
  @Named("demo.ActionAutoCompleteMenu")
  @DomainService(nature=NatureOfService.VIEW)
  @Priority(PriorityPrecedence.EARLY)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
index 015189d,ba4acdb..349f0d8
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage.java
@@@ -41,13 -41,12 +41,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.Getter;
 -import lombok.NoArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.resources.AsciiDocReaderService;
  import demoapp.dom.progmodel.actions.TvCharacter;
- 
++import lombok.Getter;
 +import lombok.NoArgsConstructor;
  
  @Named("demo.ActionAutoCompletePage")
  @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacter.java
index ab65940,ab65940..a503de6
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacter.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacter.java
@@@ -28,9 -28,9 +28,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacterByShow.java
index 4782b71,4782b71..348cf79
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacterByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacterByShow.java
@@@ -28,10 -28,10 +28,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacters.java
index 244c304,244c304..0c3f934
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacters.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharacters.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShow.java
index d87c73e,d87c73e..349e124
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShow.java
@@@ -28,14 -28,14 +28,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom.progmodel.actions.TvCharacter;
++import demoapp.dom.progmodel.actions.TvShow;
  import lombok.RequiredArgsConstructor;
  import lombok.Value;
  import lombok.val;
  import lombok.experimental.Accessors;
  
--import demoapp.dom.progmodel.actions.TvCharacter;
--import demoapp.dom.progmodel.actions.TvShow;
--
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShows.java
index 3370be5,3370be5..e40e908
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShows.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompletePage_selectTvCharactersByShows.java
@@@ -28,10 -28,10 +28,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
index 2b9f7a7,43d5d96..377995e
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionItemEntity.java
@@@ -18,10 -18,7 +18,7 @@@
   */
  package demoapp.dom.progmodel.actions.bulk;
  
- import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import demoapp.dom._infra.values.ValueHolder;
- 
 -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
index 4c0a147,82c0ee3..275964b
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java
@@@ -18,9 -18,12 +18,12 @@@
   */
  package demoapp.dom.progmodel.actions.bulk;
  
+ import java.util.Arrays;
+ import java.util.List;
+ 
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
index 373b7d1,6f3e529..e10f9d3
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/BulkActionPage.java
@@@ -18,28 -18,28 +18,27 @@@
   */
  package demoapp.dom.progmodel.actions.bulk;
  
+ 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.XmlElementWrapper;
 -import javax.xml.bind.annotation.XmlRootElement;
 -import javax.xml.bind.annotation.XmlType;
 +import jakarta.inject.Named;
 +import jakarta.xml.bind.annotation.XmlAccessType;
 +import jakarta.xml.bind.annotation.XmlAccessorType;
 +import jakarta.xml.bind.annotation.XmlElement;
 +import jakarta.xml.bind.annotation.XmlElementWrapper;
 +import jakarta.xml.bind.annotation.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.DomainObjectLayout;
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
- import java.util.ArrayList;
- import java.util.List;
 -import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  //tag::class[]
  @Named("demo.BulkActionPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
index 227d785,81e4d4e..028240e
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jdo/BulkActionItemEntityImpl.java
@@@ -18,10 -18,10 +18,11 @@@
   */
  package demoapp.dom.progmodel.actions.bulk.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
 -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
++
++import jakarta.inject.Named;
 +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  
  import org.springframework.context.annotation.Profile;
  
@@@ -29,11 -29,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  
++import demoapp.dom.progmodel.actions.bulk.BulkActionItemEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.progmodel.actions.bulk.BulkActionItemEntity;
--
  @Profile("demo-jdo")
  @PersistenceCapable(
      identityType = IdentityType.DATASTORE,
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
index d17aabb,418ee84..d2d572b
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/bulk/jpa/BulkActionItemEntityImpl.java
@@@ -33,12 -33,12 +33,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.progmodel.actions.bulk.BulkActionItemEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.progmodel.actions.bulk.BulkActionItemEntity;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
index 74b2a80,ad881d9..0130ad7
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java
@@@ -29,11 -29,11 +29,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.services.factory.FactoryService;
  
++import demoapp.dom.progmodel.actions.TvCharacterPopulator;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom.progmodel.actions.TvCharacterPopulator;
--
  @Named("demo.ActionChoicesMenu")
  @DomainService(nature=NatureOfService.VIEW)
  @Priority(PriorityPrecedence.EARLY)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
index 68ad35b,eb795a7..51fe871
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage.java
@@@ -41,14 -41,12 +41,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
- import demoapp.dom._infra.resources.AsciiDocReaderService;
- 
--import lombok.Getter;
 -import lombok.NoArgsConstructor;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+ import demoapp.dom._infra.resources.AsciiDocReaderService;
  import demoapp.dom.progmodel.actions.TvCharacter;
- 
++import lombok.Getter;
 +import lombok.NoArgsConstructor;
  
  @Named("demo.ActionChoices")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacter.java
index 5670ef7,5670ef7..ebf0699
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacter.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacter.java
@@@ -26,9 -26,9 +26,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacterByShow.java
index c023ce6,c023ce6..ee404a1
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacterByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacterByShow.java
@@@ -27,10 -27,10 +27,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacters.java
index ce54953,ce54953..174f06a
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacters.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharacters.java
@@@ -27,9 -27,9 +27,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShow.java
index 79f0970,79f0970..c7c01b8
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShow.java
@@@ -27,14 -27,14 +27,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom.progmodel.actions.TvCharacter;
++import demoapp.dom.progmodel.actions.TvShow;
  import lombok.RequiredArgsConstructor;
  import lombok.Value;
  import lombok.val;
  import lombok.experimental.Accessors;
  
--import demoapp.dom.progmodel.actions.TvCharacter;
--import demoapp.dom.progmodel.actions.TvShow;
--
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShows.java
index 792b546,792b546..c8a4f43
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShows.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesPage_selectTvCharactersByShows.java
@@@ -27,10 -27,10 +27,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
index f98b27f,b3602c4..00e886e
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java
@@@ -29,11 -29,11 +29,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.services.factory.FactoryService;
  
++import demoapp.dom.progmodel.actions.TvCharacterPopulator;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom.progmodel.actions.TvCharacterPopulator;
--
  @Named("demo.ActionDefaultsMenu")
  @DomainService(nature=NatureOfService.VIEW)
  @Priority(PriorityPrecedence.EARLY)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
index 588c2b7,bc2325f..48d2402
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage.java
@@@ -42,16 -42,14 +42,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
- import demoapp.dom.progmodel.actions.TvShow;
- 
--import lombok.Getter;
 -import lombok.NoArgsConstructor;
 -import lombok.Setter;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.resources.AsciiDocReaderService;
  import demoapp.dom.progmodel.actions.TvCharacter;
- 
+ import demoapp.dom.progmodel.actions.TvShow;
++import lombok.Getter;
 +import lombok.NoArgsConstructor;
 +import lombok.Setter;
  
  @Named("demo.ActionDefaults")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacterByShow.java
index 1acdf43,5e40c50..15f7423
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacterByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacterByShow.java
@@@ -21,12 -21,16 +21,15 @@@ package demoapp.dom.progmodel.actions.d
  import java.util.Collection;
  import java.util.stream.Collectors;
  
- import org.apache.causeway.applib.annotation.*;
+ import org.apache.causeway.applib.annotation.Action;
+ import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.applib.annotation.Optionality;
+ import org.apache.causeway.applib.annotation.Parameter;
+ import org.apache.causeway.applib.annotation.SemanticsOf;
+ 
 -import lombok.RequiredArgsConstructor;
 -
+ import demoapp.dom.progmodel.actions.TvCharacter;
+ import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacters.java
index c83b6e6,c83b6e6..cbed1bb
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacters.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharacters.java
@@@ -28,9 -28,9 +28,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharactersByShowAndSex.java
index ebe88bd,ebe88bd..d741c76
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharactersByShowAndSex.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsPage_selectTvCharactersByShowAndSex.java
@@@ -28,14 -28,14 +28,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom.progmodel.actions.TvCharacter;
++import demoapp.dom.progmodel.actions.TvShow;
  import lombok.RequiredArgsConstructor;
  import lombok.Value;
  import lombok.val;
  import lombok.experimental.Accessors;
  
--import demoapp.dom.progmodel.actions.TvCharacter;
--import demoapp.dom.progmodel.actions.TvShow;
--
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
index 88e2aa7,33712d3..f3a21a9
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java
@@@ -29,11 -29,11 +29,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.services.factory.FactoryService;
  
++import demoapp.dom.progmodel.actions.TvCharacterPopulator;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom.progmodel.actions.TvCharacterPopulator;
--
  @Named("demo.ActionValidateMenu")
  @DomainService(nature=NatureOfService.VIEW)
  @Priority(PriorityPrecedence.EARLY)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
index b34d25d,7f2c2f8..164753c
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage.java
@@@ -42,14 -42,14 +42,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.Getter;
--import lombok.NoArgsConstructor;
--import lombok.Setter;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.resources.AsciiDocReaderService;
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.Getter;
++import lombok.NoArgsConstructor;
++import lombok.Setter;
  
  @Named("demo.ActionValidatePage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacterByShow.java
index 83a56c8,83a56c8..0e3277d
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacterByShow.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacterByShow.java
@@@ -26,10 -26,10 +26,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
  import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacters.java
index 8372588,aa39758..36ff1f4
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacters.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharacters.java
@@@ -26,7 -22,15 +22,14 @@@ import java.util.Collection
  import java.util.List;
  import java.util.stream.Collectors;
  
- import org.apache.causeway.applib.annotation.*;
+ import org.apache.causeway.applib.annotation.Action;
+ import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.applib.annotation.Optionality;
+ import org.apache.causeway.applib.annotation.Parameter;
+ import org.apache.causeway.applib.annotation.SemanticsOf;
+ 
 -import lombok.RequiredArgsConstructor;
 -
+ import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.IDEMPOTENT)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingName.java
index 08ae5a3,919a3de..dd2678a
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingName.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingName.java
@@@ -27,7 -22,16 +22,15 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.stream.Collectors;
  
- import org.apache.causeway.applib.annotation.*;
+ import org.apache.causeway.applib.annotation.Action;
+ import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.applib.annotation.Optionality;
+ import org.apache.causeway.applib.annotation.Parameter;
+ import org.apache.causeway.applib.annotation.SemanticsOf;
+ 
 -import lombok.RequiredArgsConstructor;
 -
+ import demoapp.dom.progmodel.actions.TvCharacter;
+ import demoapp.dom.progmodel.actions.TvShow;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingRecord.java
index 369cb8e,369cb8e..f32e839
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingRecord.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidatePage_selectTvCharactersByShowAndSexUsingRecord.java
@@@ -28,14 -28,14 +28,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
++import demoapp.dom.progmodel.actions.TvCharacter;
++import demoapp.dom.progmodel.actions.TvShow;
  import lombok.RequiredArgsConstructor;
  import lombok.Value;
  import lombok.val;
  import lombok.experimental.Accessors;
  
--import demoapp.dom.progmodel.actions.TvCharacter;
--import demoapp.dom.progmodel.actions.TvShow;
--
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
index 7c69367,3b15e4b..ceb56a3
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java
@@@ -29,11 -29,11 +29,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PriorityPrecedence;
  import org.apache.causeway.applib.services.factory.FactoryService;
  
++import demoapp.dom.progmodel.actions.TvCharacterPopulator;
  import lombok.RequiredArgsConstructor;
  import lombok.val;
  
--import demoapp.dom.progmodel.actions.TvCharacterPopulator;
--
  @Named("demo.ActionVetoMenu")
  @DomainService(nature=NatureOfService.VIEW)
  @Priority(PriorityPrecedence.EARLY)
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
index 25c215f,6b8d596..9743fa0
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage.java
@@@ -41,13 -41,13 +41,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.Getter;
--import lombok.NoArgsConstructor;
--import lombok.Setter;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.resources.AsciiDocReaderService;
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.Getter;
++import lombok.NoArgsConstructor;
++import lombok.Setter;
  
  @Named("demo.ActionVetoPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersBySex.java
index f881635,5e9faed..f5f320c
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersBySex.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersBySex.java
@@@ -28,8 -22,17 +22,16 @@@ import java.util.Collection
  import java.util.List;
  import java.util.stream.Collectors;
  
- import org.apache.causeway.applib.annotation.*;
+ import org.apache.causeway.applib.annotation.Action;
+ import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.applib.annotation.Optionality;
+ import org.apache.causeway.applib.annotation.Parameter;
+ 
++import demoapp.dom.progmodel.actions.TvCharacter;
+ import lombok.RequiredArgsConstructor;
+ import lombok.Value;
+ import lombok.experimental.Accessors;
  
 -import demoapp.dom.progmodel.actions.TvCharacter;
 -
  //tag::class[]
  @Action
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotDisabled.java
index 551d5c6,551d5c6..4d965b2
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotDisabled.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotDisabled.java
@@@ -26,9 -26,9 +26,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Optionality;
  import org.apache.causeway.applib.annotation.Parameter;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action
diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotHidden.java
index d6d1ff6,30f0d5e..b1667f4
--- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotHidden.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoPage_selectTvCharactersIfNotHidden.java
@@@ -30,6 -26,10 +26,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Optionality;
  import org.apache.causeway.applib.annotation.Parameter;
  
 -import lombok.RequiredArgsConstructor;
 -
+ import demoapp.dom.progmodel.actions.TvCharacter;
++import lombok.RequiredArgsConstructor;
+ 
  //tag::class[]
  @Action
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
index 86c0c3b,7265b40..f38f1a8
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/EmailAddressValueSemantics.java
@@@ -18,20 -18,15 +18,15 @@@
   */
  package demoapp.dom.progmodel.customvaluetypes.customvalues;
  
- import lombok.NonNull;
- 
  import java.util.regex.Pattern;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import org.apache.causeway.applib.services.bookmark.IdStringifier;
- import org.apache.causeway.applib.value.semantics.Parser;
- import org.apache.causeway.commons.internal.base._Strings;
- import org.apache.causeway.schema.common.v2.ValueWithTypeDto;
- 
  import org.springframework.stereotype.Component;
  
+ import org.apache.causeway.applib.services.bookmark.IdStringifier;
  import org.apache.causeway.applib.value.semantics.DefaultsProvider;
+ import org.apache.causeway.applib.value.semantics.Parser;
  import org.apache.causeway.applib.value.semantics.Renderer;
  import org.apache.causeway.applib.value.semantics.ValueDecomposition;
  import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
index d26c3be,2810c3f..14ed12d
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypePage.java
@@@ -27,11 -27,11 +27,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  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[]
  @Named("demo.ScalarValueTypePage")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
index ba2c0c1,193cc59..750611e
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdo.java
@@@ -18,7 -18,7 +18,6 @@@
   */
  package demoapp.dom.progmodel.customvaluetypes.embeddedvalues.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
@@@ -26,6 -26,6 +25,8 @@@ import javax.jdo.annotations.IdentityTy
  import javax.jdo.annotations.PersistenceCapable;
  import javax.jdo.annotations.Persistent;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -33,11 -33,11 +34,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.Property;
  
--import lombok.Getter;
--import lombok.Setter;
--
  import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.ComplexNumber;
  import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.NumberConstantEntity;
++import lombok.Getter;
++import lombok.Setter;
  
  @Profile("demo-jdo")
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdoRepository.java
index 677d969,677d969..da26d1f
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdoRepository.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/NumberConstantJdoRepository.java
@@@ -21,10 -21,10 +21,9 @@@ package demoapp.dom.progmodel.customval
  import org.springframework.context.annotation.Profile;
  import org.springframework.stereotype.Service;
  
--import lombok.val;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.ComplexNumber;
++import lombok.val;
  
  @Profile("demo-jdo")
  @Service
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
index 7e8ade0,8a9c004..82dfe3c
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpa.java
@@@ -33,13 -33,13 +33,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.ComplexNumber;
++import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.NumberConstantEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.ComplexNumber;
--import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.NumberConstantEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpaRepository.java
index 9051aef,9051aef..a028e6c
--- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpaRepository.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/NumberConstantJpaRepository.java
@@@ -21,10 -21,10 +21,9 @@@ package demoapp.dom.progmodel.customval
  import org.springframework.context.annotation.Profile;
  import org.springframework.stereotype.Service;
  
--import lombok.val;
--
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.progmodel.customvaluetypes.embeddedvalues.ComplexNumber;
++import lombok.val;
  
  @Profile("demo-jpa")
  @Service
diff --cc domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
index 0e53806,23d9862..3e8c25b
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/FibonacciNumberVm.java
@@@ -28,8 -28,6 +28,7 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Where;
  
 +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
  import lombok.AllArgsConstructor;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
diff --cc domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
index 06398f8,e4554dc..4dc26fa
--- a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
+++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinPage.java
@@@ -31,12 -31,12 +31,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.ObjectSupport;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.MixinPage")
  @DomainObject(nature=Nature.VIEW_MODEL)
  @DomainObjectLayout(cssClassFa="fa-mortar-pestle")
diff --cc domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
index 845f33c,ba4d12a..5e479ce
--- a/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoPage.java
@@@ -32,9 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  @Named("demo.ErrorReportingServiceDemoPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index 0757e41,1c4f023..4ab6ce3
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@@ -21,12 -21,12 +21,13 @@@ package demoapp.dom.services.core.event
  import java.time.LocalDateTime;
  import java.time.format.DateTimeFormatter;
  
- 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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Action;
@@@ -35,12 -35,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Editing;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
  import lombok.Getter;
  import lombok.Setter;
  import lombok.val;
  
--import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
--
  @Profile("demo-jdo")
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
  @DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
diff --cc domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
index 866c54b,866b398..5ce95b1
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
@@@ -28,9 -28,9 +28,8 @@@ import org.springframework.stereotype.R
  
  import org.apache.causeway.applib.services.repository.RepositoryService;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
++import lombok.RequiredArgsConstructor;
  
  @Profile("demo-jdo")
  @Repository
diff --cc domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
index b6994e2,f79acfb..24ca13e
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
@@@ -35,12 -35,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Editing;
  import org.apache.causeway.applib.annotation.Property;
  
++import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
  import lombok.Getter;
  import lombok.Setter;
  import lombok.val;
  
--import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
--
  @Profile("demo-jpa")
  @Entity
  @Table(
diff --cc domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
index e7c5388,a0d71db..88d91e6
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpaRepository.java
@@@ -28,9 -28,9 +28,8 @@@ import org.springframework.stereotype.R
  
  import org.apache.causeway.applib.services.repository.RepositoryService;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
++import lombok.RequiredArgsConstructor;
  
  @Profile("demo-jpa")
  @Repository
diff --cc domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
index d97cf06,d97cf06..eccefc8
--- a/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryRepository.java
@@@ -20,9 -20,9 +20,8 @@@ package demoapp.dom.services.core.event
  
  import java.util.List;
  
--import lombok.val;
--
  import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage.UiButtonEvent;
++import lombok.val;
  
  //tag::class[]
  public interface EventLogEntryRepository<T extends EventLogEntry> {
diff --cc domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
index b135e95,b1b2e40..78af550
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryDemoPage.java
@@@ -30,9 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.ObjectSupport;
  
 -import lombok.NoArgsConstructor;
 -
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- 
 +import lombok.NoArgsConstructor;
  
  @Named("demo.WrapperFactoryDemoPage")
  @DomainObject(
diff --cc domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
index f44993e,07c2edd..8531679
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/PrimeNumberJdo.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.services.core.wrapperFactory.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -31,9 -31,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Nature;
  import org.apache.causeway.applib.annotation.Property;
  
 -import lombok.Getter;
 -
  import demoapp.dom.services.core.wrapperFactory.PrimeNumber;
- 
 +import lombok.Getter;
  
  @Profile("demo-jdo")
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
index 8cbdb38,f5bcd23..b74e02c
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpa.java
@@@ -32,11 -32,11 +32,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.services.core.wrapperFactory.PrimeNumber;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  
--import demoapp.dom.services.core.wrapperFactory.PrimeNumber;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpaFactoryAndRepository.java
index f3ae0b8,820915d..381c19d
--- a/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpaFactoryAndRepository.java
+++ b/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/PrimeNumberJpaFactoryAndRepository.java
@@@ -23,13 -23,13 +23,12 @@@ import java.util.List
  import org.springframework.context.annotation.Profile;
  import org.springframework.stereotype.Service;
  
+ import org.apache.causeway.applib.services.repository.RepositoryService;
+ 
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom.services.core.wrapperFactory.PrimeNumberFactory;
  import demoapp.dom.services.core.wrapperFactory.PrimeNumberRepository;
- 
 +import lombok.RequiredArgsConstructor;
  
- import java.util.List;
- 
  @Profile("demo-jpa")
  @Service
  @RequiredArgsConstructor
diff --cc domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
index 6d9e79b,59779ef..b65f902
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyPage.java
@@@ -42,8 -42,8 +42,7 @@@ import org.apache.causeway.applib.annot
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolderRepository;
  import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
- 
 +import lombok.NoArgsConstructor;
  
  //tag::class[]
  @Named("demo.AppTenancyPage")
diff --cc domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
index c0c7961,c0c7961..4d89664
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
@@@ -25,11 -25,11 +25,10 @@@ import org.springframework.stereotype.S
  import org.apache.causeway.extensions.secman.applib.tenancy.spi.ApplicationTenancyEvaluator;
  import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
  
++import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
  import lombok.Getter;
  import lombok.val;
  
--import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
--
  //tag::class[]
  @Service
  public class ApplicationTenancyEvaluatorForDemo
diff --cc domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
index e367781,5958e69..dc93ca2
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jdo/TenantedJdo.java
@@@ -18,12 -18,12 +18,13 @@@
   */
  package demoapp.dom.services.extensions.secman.apptenancy.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.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.Action;
@@@ -36,11 -36,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.applib.annotation.Title;
  
++import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
diff --cc domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
index b973ab0,ef56baa..7ab911b
--- a/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
+++ b/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
@@@ -38,12 -38,12 +38,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
index ed977a5,942fcc6..152959e
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Blob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 269c9c1,081ae24..f5db630
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Blob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
index 7b1038e,c44f68d..76602b6
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/CausewayBlobHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Blob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
index 7ce0acf,309ab7f..2c151fe
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo.java
@@@ -18,7 -18,7 +18,6 @@@
   */
  package demoapp.dom.types.causeway.blobs.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
@@@ -26,6 -26,6 +25,8 @@@ import javax.jdo.annotations.IdentityTy
  import javax.jdo.annotations.PersistenceCapable;
  import javax.jdo.annotations.Persistent;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -36,11 -36,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.value.Blob;
  
++import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
index a31333b,acc68f5..b17f684
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa.java
@@@ -41,9 -41,9 +41,8 @@@ import org.apache.causeway.applib.value
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom.types.causeway.blobs.persistence.CausewayBlobEntity;
++import lombok.NoArgsConstructor;
  
  @Profile("demo-jpa")
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
index 10bb50c,345d110..8676275
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causeway.blobs.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.value.Blob;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
index ab52e69,ab52e69..e1b4bd5
--- a/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
@@@ -28,12 -28,12 +28,11 @@@ import org.apache.causeway.commons.coll
  import org.apache.causeway.commons.internal.base._Bytes;
  import org.apache.causeway.commons.internal.resources._Resources;
  
++import demoapp.dom.types.Samples;
  import lombok.Getter;
  import lombok.SneakyThrows;
  import lombok.val;
  
--import demoapp.dom.types.Samples;
--
  @Service
  public class CausewayBlobsSamples implements Samples<Blob> {
  
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
index 8509e0a,06d40f8..c918b70
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Clob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
index f6870cd,0d3653b..becf206
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Clob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
index c8ea189,9c211ee..1868684
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/CausewayClobHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Clob;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
index 0e00e0e,939fb3b..9032286
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo.java
@@@ -18,7 -18,7 +18,6 @@@
   */
  package demoapp.dom.types.causeway.clobs.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
@@@ -26,6 -26,6 +25,8 @@@ import javax.jdo.annotations.IdentityTy
  import javax.jdo.annotations.PersistenceCapable;
  import javax.jdo.annotations.Persistent;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -36,11 -36,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.value.Clob;
  
++import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
index dcfb3a6,9609a75..278f9c8
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa.java
@@@ -41,9 -41,9 +41,8 @@@ import org.apache.causeway.applib.value
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  import org.apache.causeway.persistence.jpa.applib.types.ClobJpaEmbeddable;
  
--import lombok.NoArgsConstructor;
--
  import demoapp.dom.types.causeway.clobs.persistence.CausewayClobEntity;
++import lombok.NoArgsConstructor;
  
  @Profile("demo-jpa")
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
index 429eb71,202921c..895cd2d
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causeway.clobs.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.value.Clob;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
index 5d87a27,5d87a27..e0ca166
--- a/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/CausewayClobsSamples.java
@@@ -28,11 -28,11 +28,10 @@@ import org.apache.causeway.applib.value
  import org.apache.causeway.commons.internal.base._Strings;
  import org.apache.causeway.commons.internal.resources._Resources;
  
++import demoapp.dom.types.Samples;
  import lombok.SneakyThrows;
  import lombok.val;
  
--import demoapp.dom.types.Samples;
--
  @Service
  public class CausewayClobsSamples implements Samples<Clob> {
  
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
index 2a915b6,b8d10e3..e7178c3
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.LocalResourcePath;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
index e2956b3,582cd10..a0c75a7
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.LocalResourcePath;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
index 484d00a,4d10737..33ab8d8
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/CausewayLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.LocalResourcePath;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
index 7e0fc05,ad7aaab..0d9a6c0
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causeway.localresourcepaths.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -33,14 -33,13 +34,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- 
  import org.apache.causeway.applib.value.LocalResourcePath;
  
++import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
index 48b68c5,184d3ff..bd48509
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa.java
@@@ -34,16 -34,15 +34,14 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.applib.value.LocalResourcePath;
+ import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
index 6a4e884,cefe7c0..ef3ea50
--- a/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causeway.localresourcepaths.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.value.LocalResourcePath;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
index 7dc724a,937a34a..4f74ba1
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Markup;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 753d209,a40bddc..4dcdd8c
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Markup;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
index a25581e,09f4396..1af99ab
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Markup;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
index a298c3c,8c9d648..0f92c25
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causeway.markups.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,14 -34,13 +35,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
- 
  import org.apache.causeway.applib.value.Markup;
  
++import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
index 7d32b1a,7a58575..ab67128
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
@@@ -38,16 -38,15 +38,14 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
- import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.applib.value.Markup;
+ import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
index 2ca53b6,43def0e..0d35a14
--- a/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causeway.markups.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.value.Markup;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
index 7088813,421d3e8..bf2a182
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Password;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 9039e9c,44d94ca..8d432db
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Password;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
index e7090f0,c1a5b3a..3e8c046
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/CausewayPasswordHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.applib.value.Password;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
index 8e2bc3d,38608e5..d9f814c
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causeway.passwords.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -33,14 -33,13 +34,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- 
  import org.apache.causeway.applib.value.Password;
  
++import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
index bb222af,cbaf2c0..82a64ee
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa.java
@@@ -34,16 -34,15 +34,14 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
- import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.applib.value.Password;
+ import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
++import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causeway.passwords.persistence.CausewayPasswordEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
index ebe3689,65c7ded..9e946a4
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causeway.passwords.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.value.Password;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
index 3a053a9,62eec8b..3f13c18
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity_showPassword.java
@@@ -18,9 -18,7 +18,7 @@@
   */
  package demoapp.dom.types.causeway.passwords.persistence;
  
- import lombok.RequiredArgsConstructor;
- 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
index a66c228,44fe72a..88e1910
--- a/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.java
@@@ -35,11 -35,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.value.Password;
  
--import lombok.Getter;
--import lombok.Setter;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom.types.causeway.passwords.holder.CausewayPasswordHolder2;
++import lombok.Getter;
++import lombok.Setter;
  
  //tag::class[]
  @XmlRootElement(name = "root")
diff --cc domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
index d2abfb7,76484d2..2ff5b46
--- a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
+++ b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileNodeVm.java
@@@ -31,13 -31,13 +31,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Property;
  import org.apache.causeway.applib.annotation.PropertyLayout;
  
++import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  import lombok.ToString;
  
--import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
--
  @Named("demo.TreeNodeVm")
  @XmlRootElement(name="TreeNodeVm")
  @DomainObject(nature=Nature.VIEW_MODEL)
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
index d8fbcaf,a2714f8..24119c4
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 2a923ec,e65836f..b3cc998
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
index 378eabe,f0bac44..2e38fe6
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
index 43ecf5d,1963306..88a8234
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causewayval.asciidocs.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,14 -34,13 +35,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
- 
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
++import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
index 42814b2,e5d0bc9..b13f39f
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
@@@ -39,15 -39,14 +39,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
++import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
index fb0b73f,e8bf8da..96e9df4
--- a/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causewayval.asciidocs.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
index bb93bfb,f3b95f8..f82f902
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 2f49544,9a41a32..f537748
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
index 9e4f48b,dc6c2ea..16375be
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
index b17019f,1e17659..22e4638
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causewayval.markdowns.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,14 -34,13 +35,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
- 
  import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
++import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
index 99b1311,c707b48..f5bfa2e
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
@@@ -39,15 -39,14 +39,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
++import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
index bc5c736,fb9e31d..95432e9
--- a/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causewayval.markdowns.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.valuetypes.markdown.applib.value.Markdown;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
index eb6e5df,842dc43..27d61b9
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
@@@ -25,12 -25,11 +25,10 @@@ import jakarta.inject.Inject
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
index d8289e0,8fd4fe4..b708bba
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -30,12 -30,11 +30,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Parameter;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
index ba1fec2,055ddc8..ba6eb55
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
@@@ -28,12 -28,11 +28,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.MemberSupport;
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
- 
  import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
index 74a7eba,e5fde9f..96eef27
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.causewayval.vegas.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,14 -34,13 +35,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
- 
  import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
++import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
index d129a8f,cfa2530..1fb6e81
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
@@@ -39,15 -39,14 +39,13 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.applib.annotation.Where;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
- 
  import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
++import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
index f80c696,0b9bc46..80e2871
--- a/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
@@@ -18,9 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.causewayval.vegas.persistence;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.valuetypes.vega.applib.value.Vega;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
index 10a1861,24057c0..b45d4f5
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder.java
@@@ -18,10 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.javaawt.images.holder;
  
- import jakarta.inject.Named;
- 
  import java.awt.image.BufferedImage;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.BufferedImageHolder")
  //tag::class[]
  public interface BufferedImageHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
index d59c671,37308d9..57939ed
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.awt.image.BufferedImage;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 788fcb8,d56e251..3f60b7f
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.awt.image.BufferedImage;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index cd65f81,fffb709..4d9464f
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/BufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.awt.image.BufferedImage;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
index 4e949ac,7f4c452..38c74d5
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_actionReturningCollection.java
@@@ -27,9 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  
  //tag::class[]
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
index 506d29b,a8b1895..64429a3
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtBufferedImageHolder_updateReadOnlyPropertyWithChoices.java
@@@ -30,9 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
index 8b5fd24,d270b60..609da01
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/BufferedImageJdo.java
@@@ -20,13 -20,13 +20,14 @@@ package demoapp.dom.types.javaawt.image
  
  import java.awt.image.BufferedImage;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
index c2c326c,fbf79a4..9adeaf6
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageEntity.java
@@@ -18,7 -18,9 +18,9 @@@
   */
  package demoapp.dom.types.javaawt.images.persistence;
  
+ import java.awt.image.BufferedImage;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
index ee227bd,7120076..2f14d9d
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/BufferedImageSeeding.java
@@@ -18,7 -18,9 +18,9 @@@
   */
  package demoapp.dom.types.javaawt.images.persistence;
  
+ import java.awt.image.BufferedImage;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
@@@ -32,7 -32,7 +32,7 @@@ public class BufferedImageSeedin
  extends SeedServiceAbstract {
  
      @Inject
--    public BufferedImageSeeding(ValueHolderRepository<BufferedImage, ? extends BufferedImageEntity> entities) {
++    public BufferedImageSeeding(final ValueHolderRepository<BufferedImage, ? extends BufferedImageEntity> entities) {
          super(entities);
      }
  
diff --cc domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
index 30ae9ce,11d1d16..fdd36bf
--- a/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
+++ b/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
@@@ -28,11 -28,11 +28,10 @@@ import org.springframework.stereotype.S
  import org.apache.causeway.commons.internal.base._Bytes;
  import org.apache.causeway.commons.internal.resources._Resources;
  
++import demoapp.dom.types.Samples;
  import lombok.SneakyThrows;
  import lombok.val;
  
--import demoapp.dom.types.Samples;
--
  @Service
  public class JavaAwtBufferedImagesSamples implements Samples<BufferedImage> {
  
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
index 42a321f,f5bb57d..83ca7b8
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.booleans.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Boolean;
- 
  @Named("demo.WrapperBooleanHolder")
  //tag::class[]
  public interface WrapperBooleanHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
index 8581740,8cb94bb..0921edc
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Boolean;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 1f84667,ed5145d..ffeb526
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Boolean;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
index aa4ed2a,51710ff..f7866f7
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Boolean;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
index 819e6fa,e9a83a2..bd286c9
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.booleans.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Boolean;
- 
++import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
index 6fed5e0,89ecca5..70b3caf
--- a/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Boolean;
- 
++import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
index 0867cc3,e742108..e736952
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.bytes.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Byte;
- 
  @Named("demo.WrapperByteHolder")
  //tag::class[]
  public interface WrapperByteHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
index 8e20922,e65f434..5d0b569
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Byte;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
index d164466,2b2ce63..24a477d
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Byte;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
index 6eabda6,096a615..cb6af80
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Byte;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
index ba5ae5b,1e6bf10..3a69cd0
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.bytes.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Byte;
- 
++import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
index 5448d66,59c5ed6..f8f25cf
--- a/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Byte;
- 
++import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
index c7de68f,af7d920..2cd4b56
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.characters.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Character;
- 
  @Named("demo.WrapperCharacterHolder")
  //tag::class[]
  public interface WrapperCharacterHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
index 45fa75a,2c80d72..623ea4b
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Character;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a6d3c09,935c03c..915e95b
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Character;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
index 3e55c5e,51d09eb..bd0c8a1
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Character;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
index 579b4bc,7ed3e0e..5f131aa
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.characters.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Character;
- 
++import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
index 3b55baf,0a551e9..70206c3
--- a/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Character;
- 
++import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
index 038e49d,8ba13b4..1e2ee0a
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.doubles.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Double;
- 
  @Named("demo.WrapperDoubleHolder")
  //tag::class[]
  public interface WrapperDoubleHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
index d884d69,d6ced53..cb18845
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Double;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 1838a12,3dcf332..c354077
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Double;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
index 30a7f3d,28ee4ed..a5ec88e
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Double;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
index 47298e3,98c1c49..b41bb62
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.doubles.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Double;
- 
++import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
index 94c7f88,ef96f66..b6e35e5
--- a/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Double;
- 
++import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturning.java
index 41c5ee9,0975361..c79e801
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturning.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturning.java
@@@ -21,9 -21,9 +21,8 @@@ package demoapp.dom.types.javalang.enum
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
index bb7ad5a,3154ef3..8a51aed
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_actionReturningCollection.java
@@@ -26,11 -26,10 +26,9 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
- import lombok.RequiredArgsConstructor;
- 
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_mixinProperty.java
index 167ca0c,9ff7ece..1bf56ba
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_mixinProperty.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_mixinProperty.java
@@@ -22,9 -22,9 +22,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Where;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Property()
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalProperty.java
index 435b19b,1dfdeca..522b873
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalProperty.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalProperty.java
@@@ -26,9 -26,9 +26,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalPropertyWithChoices.java
index d636fcd,807afa7..4129012
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,10 +31,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
- import lombok.RequiredArgsConstructor;
- 
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyProperty.java
index 8d4efc0,f122bb0..1b41b70
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyProperty.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyProperty.java
@@@ -24,9 -24,9 +24,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyPropertyWithChoices.java
index 655c9bd,9155deb..98874ac
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/holder/JavaLangEnumHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,10 +29,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
 -import lombok.RequiredArgsConstructor;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
- import lombok.RequiredArgsConstructor;
- 
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo.java
index d19b021,20977f9..a9fbc47
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.enums.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,12 +35,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
 -import lombok.Getter;
 -import lombok.Setter;
 -
  import demoapp.dom._infra.samples.DemoEnum;
- 
+ import demoapp.dom.types.javalang.enums.persistence.JavaLangEnumEntity;
 +import lombok.Getter;
 +import lombok.Setter;
  
- import demoapp.dom.types.javalang.enums.persistence.JavaLangEnumEntity;
- 
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
index cb33346,367f240..77835d8
--- a/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa.java
@@@ -36,14 -36,13 +36,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
 +import demoapp.dom._infra.samples.DemoEnum;
- 
++import demoapp.dom.types.javalang.enums.persistence.JavaLangEnumEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
 -import demoapp.dom._infra.samples.DemoEnum;
--import demoapp.dom.types.javalang.enums.persistence.JavaLangEnumEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder.java
index 1f81535,14f1c19..d8527da
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.floats.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Float;
- 
  @Named("demo.WrapperFloatHolder")
  //tag::class[]
  public interface WrapperFloatHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_actionReturningCollection.java
index bc32a02,2bab8c1..84cbaf7
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Float;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 7e5b588,3352710..884f639
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Float;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyPropertyWithChoices.java
index 2b0abf0,fa3f042..eca5fb5
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Float;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
index ea76f12,a6b29d0..afbbda9
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.floats.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Float;
- 
++import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
index 0aa2a27,dfe5ede..f4789ca
--- a/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Float;
- 
++import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder.java
index 4f2dce1,ef12165..c101bb5
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.integers.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Integer;
- 
  @Named("demo.WrapperIntegerHolder")
  //tag::class[]
  public interface WrapperIntegerHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_actionReturningCollection.java
index 80f0e8c,0ae58a9..19807d5
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Integer;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 4f6244b,163381b..7cbbd93
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Integer;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyPropertyWithChoices.java
index b5fb764,bb06b86..d0cc29a
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Integer;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
index 0f373fd,d4e03f0..a982712
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.integers.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Integer;
- 
++import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
index ed1f175,69998c1..d0d6a9d
--- a/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Integer;
- 
++import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder.java
index c132644,5ef9074..ceb1f55
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.longs.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Long;
- 
  @Named("demo.WrapperLongHolder")
  //tag::class[]
  public interface WrapperLongHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_actionReturningCollection.java
index 7276a0b,285b7fd..7e4b8a6
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Long;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 340551a,ad4a2cf..746a22b
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Long;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyPropertyWithChoices.java
index 62bcf73,8b9d594..6f2f536
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Long;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
index e70ef12,3aed418..3ed3ce3
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.longs.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Long;
- 
++import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
index ea80ba1,fdcc0f0..eb9e93f
--- a/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Long;
- 
++import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
index fd5cd25,793454d..18d8452
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.shorts.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.Short;
- 
  @Named("demo.WrapperShortHolder")
  //tag::class[]
  public interface WrapperShortHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
index 5d37838,077f8c0..105c897
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Short;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalPropertyWithChoices.java
index d9b8d4b,aa98e14..5b6535b
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Short;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
index 9309f4f,d3feecd..1676c2b
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.Short;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
index 960a04d,ae9ebfe..4420266
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.shorts.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.Short;
- 
++import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
index 3493b92,d3e7677..8cfa49b
--- a/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.Short;
- 
++import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder.java
index 13d6593,9239581..10e8b20
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package demoapp.dom.types.javalang.strings.holder;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
- import java.lang.String;
- 
  @Named("demo.JavaLangStringHolder")
  //tag::class[]
  public interface JavaLangStringHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_actionReturningCollection.java
index 37bd8ce,87ecced..6a49d85
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_actionReturningCollection.java
@@@ -26,11 -26,9 +26,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.String;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a5dec02,bf5fe0b..d719ebd
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -31,9 +31,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.String;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyPropertyWithChoices.java
index d58786e,267a728..77ba4aa
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -29,9 +29,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.lang.String;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
index c87a04c,823ae24..10971af
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
@@@ -18,13 -18,13 +18,14 @@@
   */
  package demoapp.dom.types.javalang.strings.jdo;
  
- import jakarta.inject.Named;
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -34,11 +35,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.lang.String;
- 
++import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
index 3ab1577,05594ac..2a41867
--- a/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
@@@ -36,14 -36,12 +36,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.lang.String;
- 
++import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/BigDecimals.java
index 9d7e9b9,dd3b032..c2c903f
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/BigDecimals.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/BigDecimals.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals;
  
+ import java.math.BigDecimal;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder.java
index ea7ecaf,2eabd50..a05e555
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder.java
@@@ -18,10 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals.holder;
  
- import jakarta.inject.Named;
- 
  import java.math.BigDecimal;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.BigDecimalHolder")
  //tag::class[]
  public interface BigDecimalHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_actionReturningCollection.java
index 246a4fa,0062964..d148169
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigDecimal;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalProperty.java
index 6c26e7a,3f63ad0..972f892
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalProperty.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalProperty.java
@@@ -26,9 -28,9 +28,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigDecimal;
 -import lombok.RequiredArgsConstructor;
--
+ import demoapp.dom.types.javamath.bigdecimals.meta.Money;
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalPropertyWithChoices.java
index d88283e,43e841d..9f93f3c
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,10 +32,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigDecimal;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
+ import demoapp.dom.types.javamath.bigdecimals.meta.Money;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyProperty.java
index 20f6033,d17a197..17ad131
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyProperty.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyProperty.java
@@@ -24,9 -26,9 +26,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigDecimal;
 -import lombok.RequiredArgsConstructor;
--
+ import demoapp.dom.types.javamath.bigdecimals.meta.Money;
 +import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyPropertyWithChoices.java
index ea3a927,c76c3ce..a2e9978
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/BigDecimalHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,10 +30,9 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigDecimal;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
+ import demoapp.dom.types.javamath.bigdecimals.meta.Money;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/BigDecimalJdo.java
index 8983f44,e00611b..31c578d
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/BigDecimalJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/BigDecimalJdo.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals.jdo;
  
- import jakarta.inject.Named;
+ import java.math.BigDecimal;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,12 +37,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.math.BigDecimal;
 -import lombok.Getter;
 -import lombok.Setter;
--
+ import demoapp.dom.types.javamath.bigdecimals.meta.Money;
+ import demoapp.dom.types.javamath.bigdecimals.persistence.BigDecimalEntity;
 +import lombok.Getter;
 +import lombok.Setter;
  
- import demoapp.dom.types.javamath.bigdecimals.persistence.BigDecimalEntity;
- 
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/BigDecimalJpa.java
index 963b8da,414ab9c..a2950fc
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/BigDecimalJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/BigDecimalJpa.java
@@@ -18,13 -18,15 +18,15 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals.jpa;
  
+ import java.math.BigDecimal;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,13 +38,12 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.math.BigDecimal;
- 
++import demoapp.dom.types.javamath.bigdecimals.meta.Money;
++import demoapp.dom.types.javamath.bigdecimals.persistence.BigDecimalEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
 -import demoapp.dom.types.javamath.bigdecimals.meta.Money;
--import demoapp.dom.types.javamath.bigdecimals.persistence.BigDecimalEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java
index 0000000,59262dc..196a7b7
mode 000000,100644..100644
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java
@@@ -1,0 -1,21 +1,21 @@@
+ package demoapp.dom.types.javamath.bigdecimals.meta;
+ 
+ import java.lang.annotation.ElementType;
+ import java.lang.annotation.Inherited;
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ import java.lang.annotation.Target;
+ 
 -import javax.validation.constraints.Digits;
++import jakarta.validation.constraints.Digits;
+ 
+ @Digits(integer = 12, fraction = 2)
+ // @javax.persistence.Column(precision = 14, scale = 2) // JPA doesn't support meta-annotations
+ @javax.jdo.annotations.Column(scale = 2)                // JDO doesn't require length to be specified
+ @Inherited
+ @Target({
+         ElementType.METHOD, ElementType.FIELD,                      // <.>
+         ElementType.PARAMETER,                                      // <.>
+ })
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface Money {
+ }
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalEntity.java
index 94f5704,346366f..be43537
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalEntity.java
@@@ -18,7 -18,9 +18,9 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals.persistence;
  
+ import java.math.BigDecimal;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalSeeding.java
index 7015771,ba6156e..daf26bb
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/BigDecimalSeeding.java
@@@ -18,7 -18,9 +18,9 @@@
   */
  package demoapp.dom.types.javamath.bigdecimals.persistence;
  
+ import java.math.BigDecimal;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
@@@ -32,7 -32,7 +32,7 @@@ public class BigDecimalSeedin
  extends SeedServiceAbstract {
  
      @Inject
--    public BigDecimalSeeding(ValueHolderRepository<BigDecimal, ? extends BigDecimalEntity> entities) {
++    public BigDecimalSeeding(final ValueHolderRepository<BigDecimal, ? extends BigDecimalEntity> entities) {
          super(entities);
      }
  
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/BigIntegers.java
index 1fd7f59,6db37a6..7409398
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/BigIntegers.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/BigIntegers.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javamath.bigintegers;
  
+ import java.math.BigInteger;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder.java
index 838c5c3,1fa18df..77b89fa
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder.java
@@@ -18,10 -18,10 +18,10 @@@
   */
  package demoapp.dom.types.javamath.bigintegers.holder;
  
- import jakarta.inject.Named;
- 
  import java.math.BigInteger;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.BigIntegerHolder")
  //tag::class[]
  public interface BigIntegerHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_actionReturningCollection.java
index b7fb268,20bd9a7..6b3a7a2
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigInteger;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a654a06,eadfe11..4d39e1d
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigInteger;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyPropertyWithChoices.java
index 02db59c,aec0b1b..a2bd43f
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/BigIntegerHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.math.BigInteger;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/BigIntegerJdo.java
index 4d188f0,b9376f6..5ea25dc
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/BigIntegerJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/BigIntegerJdo.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javamath.bigintegers.jdo;
  
- import jakarta.inject.Named;
+ import java.math.BigInteger;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.math.BigInteger;
- 
++import demoapp.dom.types.javamath.bigintegers.persistence.BigIntegerEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javamath.bigintegers.persistence.BigIntegerEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/BigIntegerJpa.java
index 0a56283,f3edf80..c37147f
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/BigIntegerJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/BigIntegerJpa.java
@@@ -18,13 -18,15 +18,15 @@@
   */
  package demoapp.dom.types.javamath.bigintegers.jpa;
  
+ import java.math.BigInteger;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,12 +38,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.math.BigInteger;
- 
++import demoapp.dom.types.javamath.bigintegers.persistence.BigIntegerEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javamath.bigintegers.persistence.BigIntegerEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerEntity.java
index 95b6ec4,23f2b7b..b4fce77
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerEntity.java
@@@ -18,7 -18,9 +18,9 @@@
   */
  package demoapp.dom.types.javamath.bigintegers.persistence;
  
+ import java.math.BigInteger;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerSeeding.java
index 59ba2c0,ee9f2ff..b30e37b
--- a/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/BigIntegerSeeding.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javamath.bigintegers.persistence;
  
++
+ import java.math.BigInteger;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/Url.java
index bb0cc88,dcf19e1..45f3d1f
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/Url.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/Url.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javanet.urls;
  
+ import java.net.URL;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder.java
index 9411333,1e9133d..2cb8db5
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder.java
@@@ -18,10 -18,10 +18,11 @@@
   */
  package demoapp.dom.types.javanet.urls.holder;
  
- import jakarta.inject.Named;
 +
  import java.net.URL;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.UrlHolder")
  //tag::class[]
  public interface UrlHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_actionReturningCollection.java
index 8c5db1e,62ebcc8..a1d7e63
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.net.URL;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a0cd6ae,2b19c1c..1f97c0f
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.net.URL;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyPropertyWithChoices.java
index fb73a58,db027a3..557a90e
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/UrlHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.net.URL;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/UrlJdo.java
index fd9e305,e6ea622..963b6d3
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/UrlJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/UrlJdo.java
@@@ -18,13 -18,15 +18,17 @@@
   */
  package demoapp.dom.types.javanet.urls.jdo;
  
- import jakarta.inject.Named;
++
+ import java.net.URL;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,11 +38,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.net.URL;
- 
++import demoapp.dom.types.javanet.urls.persistence.UrlEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javanet.urls.persistence.UrlEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/UrlJpa.java
index f165bf8,f240ecf..68689f8
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/UrlJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/UrlJpa.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javanet.urls.jpa;
  
++
+ import java.net.URL;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,12 +39,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.net.URL;
- 
++import demoapp.dom.types.javanet.urls.persistence.UrlEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javanet.urls.persistence.UrlEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlEntity.java
index 43785ac,e1d48b6..1a1c705
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlEntity.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javanet.urls.persistence;
  
++
+ import java.net.URL;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlSeeding.java
index a22ed83,c16c1ba..6cf9c58
--- a/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/UrlSeeding.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javanet.urls.persistence;
  
++
+ import java.net.URL;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
index c8c1830,0731232..8d663f8
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javasql.javasqldate;
  
+ import java.sql.Date;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder.java
index cefb73c,8ac251f..3c3fc91
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder.java
@@@ -18,10 -18,10 +18,11 @@@
   */
  package demoapp.dom.types.javasql.javasqldate.holder;
  
- import jakarta.inject.Named;
 +
  import java.sql.Date;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.JavaSqlDateHolder")
  //tag::class[]
  public interface JavaSqlDateHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
index 9cad216,8a71721..09fb2fc
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Date;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
index a62cffd,632b125..9cd463c
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Date;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
index a04ef20,3f029cd..c6a28be
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Date;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
index 2ac8057,a44a2be..7a87a63
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
@@@ -18,13 -18,15 +18,17 @@@
   */
  package demoapp.dom.types.javasql.javasqldate.jdo;
  
- import jakarta.inject.Named;
++
+ import java.sql.Date;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,11 +38,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.sql.Date;
- 
++import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
index 78ade49,68237c2..032b1c3
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javasql.javasqldate.jpa;
  
++
+ import java.sql.Date;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,12 +39,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.sql.Date;
- 
++import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.java
index 85a8691,33c3a7a..066282b
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javasql.javasqldate.persistence;
  
++
+ import java.sql.Date;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateSeeding.java
index 70f9f9f,523cd38..ee8cced
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateSeeding.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javasql.javasqldate.persistence;
  
++
+ import java.sql.Date;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
index 5828c21,d7b2a3e..10267c0
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp;
  
+ import java.sql.Timestamp;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder.java
index 0a91c6f,fdad0fa..47e5d18
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder.java
@@@ -18,10 -18,10 +18,11 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.holder;
  
- import jakarta.inject.Named;
 +
  import java.sql.Timestamp;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.JavaSqlTimestampHolder")
  //tag::class[]
  public interface JavaSqlTimestampHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
index fce3b6f,5098a3d..6363cfe
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Timestamp;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 3e1084e,5e8b8f7..1d6bfb9
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Timestamp;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
index b57d3d9,30ee828..ac8e4ba
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.sql.Timestamp;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
index fa0884c,df01452..33b852e
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
@@@ -18,13 -18,15 +18,17 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.jdo;
  
- import jakarta.inject.Named;
++
+ import java.sql.Timestamp;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,11 +38,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.sql.Timestamp;
- 
++import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
index 4c28935,b24e8c9..821338a
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.jpa;
  
++
+ import java.sql.Timestamp;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,12 +39,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.sql.Timestamp;
- 
++import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
  import lombok.Getter;
  import lombok.NoArgsConstructor;
  import lombok.Setter;
  
--import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEntity;
--
  @Profile("demo-jpa")
  //tag::class[]
  @Entity
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.java
index 8027bcf,9613dc4..ecab63f
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.persistence;
  
++
+ import java.sql.Timestamp;
+ 
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampSeeding.java
index b938df7,0a41829..c2b4749
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampSeeding.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampSeeding.java
@@@ -18,7 -18,9 +18,10 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.persistence;
  
++
+ import java.sql.Timestamp;
+ 
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
  import org.springframework.stereotype.Service;
  
diff --cc domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
index 439b795,21ba19f..c8702ac
--- a/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
+++ b/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javasql.javasqltimestamp.vm;
  
++
+ import java.sql.Timestamp;
+ 
 -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 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 jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  
  import org.apache.causeway.applib.annotation.DomainObject;
  import org.apache.causeway.applib.annotation.Editing;
@@@ -34,13 -36,11 +37,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.sql.Timestamp;
- 
--import lombok.Getter;
--import lombok.Setter;
--
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom.types.javasql.javasqltimestamp.holder.JavaSqlTimestampHolder2;
++import lombok.Getter;
++import lombok.Setter;
  
  //tag::class[]
  @XmlRootElement(name = "root")
diff --cc domain/src/main/java/demoapp/dom/types/javatime/JavaTimeTypesMenu.java
index 15ad212,667bcf3..44f0e25
--- a/domain/src/main/java/demoapp/dom/types/javatime/JavaTimeTypesMenu.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/JavaTimeTypesMenu.java
@@@ -19,7 -19,7 +19,8 @@@
   */
  package demoapp.dom.types.javatime;
  
 -import javax.inject.Named;
++
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/LocalDates.java
index d4328aa,5a41b65..bdc5416
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/LocalDates.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/LocalDates.java
@@@ -18,15 -18,16 +18,16 @@@
   */
  package demoapp.dom.types.javatime.javatimelocaldate;
  
+ import java.time.LocalDate;
  import java.util.List;
  
 -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.XmlRootElement;
 -import javax.xml.bind.annotation.XmlTransient;
 -import javax.xml.bind.annotation.XmlType;
 +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.XmlRootElement;
 +import jakarta.xml.bind.annotation.XmlTransient;
 +import jakarta.xml.bind.annotation.XmlType;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.ActionLayout;
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder.java
index 5b2962f,3cd9806..2be84f2
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder.java
@@@ -18,10 -18,10 +18,11 @@@
   */
  package demoapp.dom.types.javatime.javatimelocaldate.holder;
  
- import jakarta.inject.Named;
 +
  import java.time.LocalDate;
  
 -import javax.inject.Named;
++import jakarta.inject.Named;
+ 
  @Named("demo.LocalDateHolder")
  //tag::class[]
  public interface LocalDateHolder {
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_actionReturningCollection.java
index cd17337,d7759cd..d4eb1db
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_actionReturningCollection.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_actionReturningCollection.java
@@@ -26,11 -27,9 +27,8 @@@ import jakarta.inject.Inject
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.time.LocalDate;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(semantics = SemanticsOf.SAFE)
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 41f4aca,0c97624..4ffbf5d
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@@ -31,11 -32,9 +32,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.time.LocalDate;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyPropertyWithChoices.java
index 2f03a0b,1685c21..ea73935
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/LocalDateHolder_updateReadOnlyPropertyWithChoices.java
@@@ -29,11 -30,9 +30,8 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PromptStyle;
  import org.apache.causeway.applib.annotation.SemanticsOf;
  
- import java.time.LocalDate;
- 
--import lombok.RequiredArgsConstructor;
--
  import demoapp.dom.types.Samples;
++import lombok.RequiredArgsConstructor;
  
  //tag::class[]
  @Action(
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/LocalDateJdo.java
index 8df1520,b8400a5..362ea83
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/LocalDateJdo.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/LocalDateJdo.java
@@@ -18,13 -18,15 +18,17 @@@
   */
  package demoapp.dom.types.javatime.javatimelocaldate.jdo;
  
- import jakarta.inject.Named;
++
+ import java.time.LocalDate;
+ 
 -import javax.inject.Named;
  import javax.jdo.annotations.Column;
  import javax.jdo.annotations.DatastoreIdentity;
  import javax.jdo.annotations.IdGeneratorStrategy;
  import javax.jdo.annotations.IdentityType;
  import javax.jdo.annotations.PersistenceCapable;
  
++import jakarta.inject.Named;
++
  import org.springframework.context.annotation.Profile;
  
  import org.apache.causeway.applib.annotation.DomainObject;
@@@ -34,13 -36,11 +38,10 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.PropertyLayout;
  import org.apache.causeway.applib.annotation.Title;
  
- import java.time.LocalDate;
- 
++import demoapp.dom.types.javatime.javatimelocaldate.persistence.LocalDateEntity;
  import lombok.Getter;
  import lombok.Setter;
  
--import demoapp.dom.types.javatime.javatimelocaldate.persistence.LocalDateEntity;
--
  @Profile("demo-jdo")
  //tag::class[]
  @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --cc domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/LocalDateJpa.java
index 68cac2f,7d2f46b..c5dec99
--- a/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/LocalDateJpa.java
+++ b/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/LocalDateJpa.java
@@@ -18,13 -18,15 +18,16 @@@
   */
  package demoapp.dom.types.javatime.javatimelocaldate.jpa;
  
++
+ import java.time.LocalDate;
+ 
 -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 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 org.springframework.context.annotation.Profile;
  
@@@ -36,14 -38,12 +39,11 @@@ import org.apache.causeway.applib.annot
  import org.apache.causeway.applib.annotation.Title;
  import org.apache.causeway.persistence.jpa.applib.integration.CausewayEntityListener;
  
- import java.time.LocalDate;
- 
++import demoapp.dom.types.javatime.javatimelocaldate.persistence.LocalDateEntity;
  import lombok.Getter;
... 3897 lines suppressed ...