You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/03 16:49:00 UTC

[isis] branch ISIS-2516 updated: ISIS-2516: regen. docs (after having fixed most javadoc issues)

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

ahuber pushed a commit to branch ISIS-2516
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/ISIS-2516 by this push:
     new 654db8e  ISIS-2516: regen. docs (after having fixed most javadoc issues)
654db8e is described below

commit 654db8e397d321f62b1faab44be23173c0c93826
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 3 17:48:38 2021 +0100

    ISIS-2516: regen. docs (after having fixed most javadoc issues)
---
 .../index/applib/adapters/DefaultsProvider.adoc    |   1 -
 .../index/applib/adapters/EncoderDecoder.adoc      |   1 -
 .../pages/index/applib/adapters/Parser.adoc        |   5 +-
 .../pages/index/applib/annotation/Action.adoc      |   6 +-
 .../pages/index/applib/annotation/Defaulted.adoc   |   2 -
 .../index/applib/annotation/DomainObject.adoc      |   2 -
 .../pages/index/applib/annotation/Nature.adoc      |   4 +-
 .../pages/index/applib/annotation/Property.adoc    |   2 +-
 .../pages/index/applib/annotation/Publishing.adoc  |   2 +-
 .../pages/index/applib/annotation/Where.adoc       |   6 +-
 .../pages/index/applib/clock/VirtualClock.adoc     |   4 +-
 .../applib/events/domain/ActionDomainEvent.adoc    |   2 +-
 .../events/domain/CollectionDomainEvent.adoc       |   2 +-
 .../applib/layout/component/ActionLayoutData.adoc  |   2 -
 .../layout/component/CollectionLayoutData.adoc     |   2 -
 .../layout/component/ServiceActionLayoutData.adoc  |   2 -
 .../generated/pages/index/applib/query/Query.adoc  |   2 +-
 .../RepresentsInteractionMemberExecution.adoc      |   2 +-
 .../exceprecog/ExceptionRecognizerService.adoc     |   4 +-
 .../publishing/spi/ExecutionSubscriber.adoc        |   6 +-
 .../applib/services/registry/ServiceRegistry.adoc  |   8 +-
 .../applib/services/scratchpad/Scratchpad.adoc     |   2 +-
 .../applib/services/swagger/SwaggerService.adoc    |   2 +
 .../index/applib/services/user/UserService.adoc    |   2 +-
 .../applib/services/wrapper/WrappingObject.adoc    |   4 +-
 .../services/wrapper/control/ExecutionMode.adoc    |   2 +-
 .../wrapper/events/ActionInvocationEvent.adoc      |   2 +-
 .../wrapper/events/ActionVisibilityEvent.adoc      |   2 +-
 .../services/wrapper/events/InteractionEvent.adoc  |   4 +-
 .../services/wrapper/events/VisibilityEvent.adoc   |   2 +-
 .../wrapper/listeners/InteractionListener.adoc     |   2 +-
 .../services/xactn/TransactionalProcessor.adoc     |   2 +-
 .../snapshot/SnapshottableWithInclusions.adoc      |   2 +-
 .../index/applib/types/MemberIdentifierType.adoc   |   2 +-
 .../pages/index/applib/types/TargetActionType.adoc |   2 +-
 .../pages/index/applib/types/TargetClassType.adoc  |   2 +-
 .../pages/index/applib/util/TitleBuffer.adoc       |  20 +-
 .../applib/util/schema/InteractionDtoUtils.adoc    |   4 +-
 .../pages/index/commons/collections/Can.adoc       | 239 +++++++++++++++++++++
 .../collections/Cardinality.adoc}                  |  30 ++-
 .../extensions/restclient/ResponseDigest.adoc      |   4 +-
 .../api/permission/ApplicationPermission.adoc      |   2 +-
 .../extensions/secman/api/user/AccountType.adoc    |   2 +-
 .../jdo/seed/SeedUsersAndRolesFixtureScript.adoc   |   2 +-
 .../jpa/seed/SeedUsersAndRolesFixtureScript.adoc   |   2 +-
 .../base/applib/valuetypes/LocalDateInterval.adoc  |   2 +-
 .../subdomains/excel/testing/ExcelFixture.adoc     |   2 +-
 .../subdomains/excel/testing/ExcelFixture2.adoc    |   2 +-
 .../restfulobjects/applib/util/MediaTypes.adoc     |   4 +-
 .../ContentNegotiationServiceOrgApacheIsisV2.adoc  |   2 +-
 .../modules/generated/pages/system-overview.adoc   |  48 ++---
 51 files changed, 348 insertions(+), 118 deletions(-)

diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc b/antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc
index 0e92d35..cc3b988 100644
--- a/antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc
@@ -6,7 +6,6 @@ Provides a mechanism for providing a default value for an object.
 This interface is used in two complementary ways:
 
 * As one option, it allows objects to take control of their own default values, by implementing directly. However, the instance is used as a factory for itself. The framework will instantiate an instance, invoke the appropriate method method, and use the returned object. The instantiated instance itself will be discarded.
-* Alternatively, an implementor of this interface can be nominated in the _org.apache.isis.applib.annotations.Defaulted_ annotation, allowing a class that needs to have a default to indicate where its default comes from.
 
 Whatever the class that implements this interface, it must also expose either a `public` no-arg constructor, or (for implementations that also are `Facet` s) a `public` constructor that accepts a single `FacetHolder` . This constructor allows the framework to instantiate the object reflectively.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc b/antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc
index 7d41051..f90d73d 100644
--- a/antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc
@@ -6,7 +6,6 @@ Provides a mechanism for encoding/decoding objects.
 This interface is used in two complementary ways:
 
 * As one option, it allows objects to take control of their own encoding/decoding, by implementing directly. However, the instance is used as a factory for itself. The framework will instantiate an instance, invoke the appropriate method method, and use the returned object. The instantiated instance itself will be discarded.
-* Alternatively, an implementor of this interface can be nominated in the _org.apache.isis.applib.annotation.Encodable_ annotation, allowing a class that needs to be encodeable to indicate how it can be encoded/decoded.
 
 Whatever the class that implements this interface, it must also expose either a `public` no-arg constructor, or (for implementations that also are `Facet` s) a `public` constructor that accepts a single `FacetHolder` . This constructor allows the framework to instantiate the object reflectively.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc b/antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc
index 5e41fcf..7c24f0d 100644
--- a/antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc
@@ -11,14 +11,11 @@ Specifically, this interface embodies three related capabilities:
 
 For custom-written (as opposed to third-party) value types, the ability for the xref:system:generated:index/applib/adapters/Parser.adoc[Parser] to provide a title responsibilities overlap with other conventions for domain objects. Specifically, normally we write a `title()` method to return a title. In such cases a typical implementation of xref:system:generated:index/applib/adapters/Parser.adoc[Parser] would just delegate to the value type itself to obtain the title (ie invoking the `ti [...]
 
-Similarly, the ability to return a typical length also overlaps with the _TypicalLength_ annotation; which is why _TypicalLength_ cannot be applied to types, only to properties and parameters.
-
-For third-party value types, eg _http://timeandmoney.sourceforge.net/ Time-and-Money_ there is no ability to write `title()` methods or annotated with _TypicalLength_ ; so this is the main reason that this interface has to deal with titles and lengths.
+For third-party value types, eg seeTime-and-Moneythere is no ability to write `title()` methods; so this is the main reason that this interface has to deal with titles and lengths.
 
 This interface is used in two complementary ways:
 
 * As one option, it allows objects to take control of their own parsing, by implementing directly. However, the instance is used as a factory for itself. The framework will instantiate an instance, invoke the appropriate method method, and use the returned object. The instantiated instance itself will be discarded.
-* Alternatively, an implementor of this interface can be nominated in the _org.apache.isis.applib.annotation.Parseable_ annotation, allowing a class that needs to be parseable to indicate how it can be parsed.
 
 Whatever the class that implements this interface, it must also expose either a `public` no-arg constructor, or (for implementations that also are `Facet` s) a `public` constructor that accepts a single `FacetHolder` . This constructor allows the framework to instantiate the object reflectively.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
index ade6d4a..7cce51f 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
@@ -87,7 +87,7 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
 <.> `[teal]#*_executionPublishing_*#` : `xref:system:generated:index/applib/annotation/Publishing.adoc[Publishing]`
 +
 --
-Whether _Interaction.Execution_ s (triggered by action invocations), should be published to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether _Execution_ s (triggered by action invocations), should be published to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 --
 <.> `[teal]#*_hidden_*#` : `xref:system:generated:index/applib/annotation/Where.adoc[Where]`
 +
@@ -96,7 +96,7 @@ Indicates where (in the UI) the action is not visible to the user.
 
 It is also possible to suppress an action's visibility using _ActionLayout#hidden()_ .
 
-For xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ and for contributed actions on how it is _ActionLayout#contributed()_ .
+For xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
 --
 <.> `[teal]#*_restrictTo_*#` : `xref:system:generated:index/applib/annotation/RestrictTo.adoc[RestrictTo]`
 +
@@ -118,7 +118,7 @@ The type-of the elements returned by the action.
 <.> `[teal]#*_fileAccept_*#` : `String`
 +
 --
-For downloading _Blob_ or _Clob_ , optionally restrict the files accepted (eg `.xslx` ).
+For downloading xref:system:generated:index/applib/value/Blob.adoc[Blob] or xref:system:generated:index/applib/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 
 The value should be of the form "file_extension|audio/*|video/*|image/*|media_type".
 --
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc
index ebb9e39..0905995 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc
@@ -5,8 +5,6 @@ Indicates that the class should have a default, by providing a link to a xref:sy
 
 This possibly seems a little tortuous. The more obvious means to provide a default would seem to be a simple `@DefaultsTo(new SomeObject())` . However, Java only allows primitives, strings and class literals to be used in annotations. We therefore need delegate to an external implementation. (This more complex design is also more flexible of course; the implementation of xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] could adjust the default it provid [...]
 
-Note: This annotation is only incompletely recognized by the framework, and may be deprecated in the future.
-
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc
index 83e0caf..a61f01b 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc
@@ -91,8 +91,6 @@ Whether entity changes should be published to _org.apache.isis.applib.services.p
 <.> `[teal]#*_mixinMethod_*#` : `String`
 +
 --
-Equivalent to _Mixin#method()_ .
-
 Applicable only if _#nature()_ is _Nature#MIXIN_ .
 --
 <.> `[teal]#*_nature_*#` : `xref:system:generated:index/applib/annotation/Nature.adoc[Nature]`
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc
index 53bb1b3..dc7e7c5 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc
@@ -3,8 +3,6 @@
 
 The different sorts of domain objects recognized by Isis.
 
-Note that _#EXTERNAL_ENTITY_ and _#VIEW_MODEL_ are implemented identically internally; the difference is one of intent.
-
 .Java Sources
 [source,java]
 ----
@@ -43,7 +41,7 @@ Currently implies no additional semantics other than documentation.
 --
 An object that is conceptually part of the application layer, and which surfaces behavior and/or state that is aggregate of one or more domain entity.
 
-The identity of a view model is determined solely by the state of object's properties (that have not been set to be ignored using _org.apache.isis.applib.annotation.Property#notPersisted()_ ). Using this nature should be considered exactly equivalent to annotating with xref:system:generated:index/applib/ViewModel.adoc[ViewModel] .
+The identity of a view model is determined solely by the state of object's properties. Using this nature should be considered exactly equivalent to annotating with xref:system:generated:index/applib/ViewModel.adoc[ViewModel] .
 
 Note that collections are ignored; if their state is required to fully identify the view model, define the view model using the JAXB _XmlRootElement_ annotation instead (where the object's state is serialized to an arbitrarily deep graph of data, with references to persistent entities transparently resolved to<oid-dto>elements).
 --
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc
index fe09900..3655b48 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc
@@ -86,7 +86,7 @@ If _#editing()_ is set to _Editing#DISABLED_ , then the reason to provide to the
 <.> `[teal]#*_executionPublishing_*#` : `xref:system:generated:index/applib/annotation/Publishing.adoc[Publishing]`
 +
 --
-Whether _Interaction.Execution_ s (triggered property edits), should be dispatched to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether _org.apache.isis.applib.services.iactn.Interaction.Execution_ s (triggered property edits), should be dispatched to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 --
 <.> `[teal]#*_fileAccept_*#` : `String`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc
index 4c1a189..2e55cba 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc
@@ -12,7 +12,7 @@ The available policies as to whether data should be published to corresponding s
 * *xref:system:generated:index/applib/services/command/Command.adoc[Command] ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber]*
 
  *
-* *_Interaction.Execution_ ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]*
+* *_org.apache.isis.applib.services.iactn.Interaction.Execution_ ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]*
 
  ** * * * 
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc
index 56240cf..bd33de7 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc
@@ -1,14 +1,12 @@
 = Where : _enum_
 :Notice: 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 ag [...]
 
-Represents the location in the user interface where a class member is to be rendered.Framework Implementation Notes
+Represents the location in the user interface where a class member is to be rendered.
 
-Used to control visibility (eg using the _Hidden_ annotation) and enablement (eg using the _Disabled_ annotation) in different regions of the user interface.
+Used to control visibility (eg using the _Property#hidden()_ annotation) and enablement (eg using the _Property#editing()_ annotation) in different regions of the user interface.
 
 The application programmer may use any of the values of this enum. Some represent concrete locations (eg _#OBJECT_FORMS_ , _#PARENTED_TABLES_ ), whereas some represent a combination of locations (eg _#ALL_TABLES_ , _#ANYWHERE_ ).
 
-This enum is also used internally within the framework. When rendering an element, the framework developer should only use those values that represent concrete locations.
-
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc b/antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc
index 1bc57a2..da6c289 100644
--- a/antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc
@@ -1,9 +1,7 @@
 = VirtualClock : _interface_
 :Notice: 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 ag [...]
 
-Works in connection with _InteractionFactory_ , such that it allows an xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] to run with its own simulated (or actual) time.
-
-Relates to _VirtualContext_
+Works in connection with _org.apache.isis.core.interaction.session.InteractionFactory_ , such that it allows an xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] to run with its own simulated (or actual) time.
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc
index 195b1f9..92b46ef 100644
--- a/antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc
@@ -32,7 +32,7 @@ Recommended because it reduces the amount of boilerplate in the domain object cl
 <.> `[teal]#*setReturnValue*#(Object returnValue)` : `void`
 +
 --
-Set by the framework. Event subscribers can replace the value with some other value if they wish, though only in the _Phase#EXECUTED_ phase.
+Set by the framework. Event subscribers can replace the value with some other value if they wish, though only in the _AbstractDomainEvent.Phase#EXECUTED_ phase.
 --
 <.> `[teal]#*setSemantics*#(xref:system:generated:index/applib/annotation/SemanticsOf.adoc[SemanticsOf] semantics)` : `void`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc
index bd51eaf..3a7d99c 100644
--- a/antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc
@@ -31,6 +31,6 @@ Not API, set by the framework.
 <.> `[teal]#*setOf*#(Of of)` : `void`
 +
 --
-Not API; updates from _Of#ACCESS_ to either _Of#ADD_TO_ or _Of#REMOVE_FROM_ when hits the _org.apache.isis.applib.events.domain.AbstractDomainEvent.Phase#VALIDATE validation phase_ .
+Not API; updates from _Of#ACCESS_ to either _Of#ADD_TO_ or _Of#REMOVE_FROM_ when hits the _AbstractDomainEvent.Phase#VALIDATE validation phase_ .
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc b/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc
index d87d67f..f4b90b6 100644
--- a/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc
@@ -3,8 +3,6 @@
 
 Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotation.ActionLayout_ .
 
-Note that _org.apache.isis.applib.annotation.ActionLayout#contributed()_ is omitted because this only applies to domain services.
-
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc b/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc
index dd805ed..6dbffe4 100644
--- a/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc
@@ -3,8 +3,6 @@
 
 Describes the layout of a single collection, broadly corresponds to the _org.apache.isis.applib.annotation.CollectionLayout_ annotation.
 
-Note that _org.apache.isis.applib.annotation.CollectionLayout#render()_ is omitted because _#defaultView_ is its replacement.
-
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc b/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc
index 9be2883..b40bd8f 100644
--- a/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc
@@ -3,8 +3,6 @@
 
 Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotation.ActionLayout_ .
 
-Note that _org.apache.isis.applib.annotation.ActionLayout#contributed()_ is omitted because this only applies to domain services.
-
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
index d0fa882..b2c134c 100644
--- a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
@@ -5,7 +5,7 @@ For use by repository implementations, representing the values of a query.
 
 The implementations of these objects are be provided by the underlying persistor/object store; consult its documentation.
 
-Implementations are expected to implement the _#getStart()_ and _#getCount()_ methods, which are used to support range / paging the data. Returned result sets are expected to start from index "start", and no more than "count" items are expected.
+Implementations are expected to implement the _#getRange()_ method, which is used to support range / paging the data. Returned result sets are expected to start from index "start", and no more than "count" items are expected.
 
  *Note:* not every object store will necessarily support this interface. In particular, the in-memory object store does not. For this, you can use the _Predicate_ interface to similar effect, for example in _RepositoryService#allMatches(Class, Predicate, long, long)_ ). *Note:* that the predicate is applied within the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[RepositoryService] (ie client-side) rather than being pushed back to the object store.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc b/antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc
index d6eb750..b820457 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc
@@ -1,7 +1,7 @@
 = RepresentsInteractionMemberExecution : _interface_
 :Notice: 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 ag [...]
 
-Extends xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] , where the _HasUniqueId#getUniqueId()_ is interpreted as an interaction (cf _InteractionDto_ ) that has at least one member execution (cf _org.apache.isis.schema.ixn.v1.MemberExecutionDto_ ) and may (by way of xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] ) contain several.
+Extends xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] , where the _HasUniqueId#getUniqueId()_ is interpreted as an interaction (cf _InteractionDto_ ) that has at least one member execution (cf _MemberExecutionDto_ ) and may (by way of xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] ) contain several.
 
 Examples could include SPI services that persist published events and status messages.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc
index b10205c..97b9891 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc
@@ -14,13 +14,13 @@ interface ExceptionRecognizerService {
 }
 ----
 
-<.> `[teal]#*getExceptionRecognizers*#()` : `Can<xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]>`
+<.> `[teal]#*getExceptionRecognizers*#()` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]>`
 <.> `[teal]#*recognize*#(Throwable ex)` : `Optional<Recognition>`
 +
 --
 Takes into consideration ExceptionRecognizers as given by _#getExceptionRecognizers()_ .
 --
-<.> `[teal]#*recognizeFromSelected*#(Can<xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]> recognizers, Throwable ex)` : `Optional<Recognition>`
+<.> `[teal]#*recognizeFromSelected*#(xref:system:generated:index/commons/collections/Can.adoc[Can]<xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]> recognizers, Throwable ex)` : `Optional<Recognition>`
 +
 --
 Takes into consideration ExceptionRecognizers as given by _recognizers_ .
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc
index 8c385c9..f8634ac 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc
@@ -1,7 +1,7 @@
 = ExecutionSubscriber : _interface_
 :Notice: 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 ag [...]
 
-SPI that allows individual interactions (action invocations or property edits) to be _#publish(Interaction.Execution) published_ . Note that re-publishing is not part of this SPI.
+SPI that allows individual interactions (action invocations or property edits) to be _#onExecution(Interaction.Execution) published_ . Note that re-publishing is not part of this SPI.
 
 .Java Sources
 [source,java]
@@ -15,8 +15,8 @@ interface ExecutionSubscriber {
 <.> `[teal]#*onExecution*#(Execution<?, ?> execution)` : `void`
 +
 --
-Publish each _Interaction.Execution_ immediately after it completes.
+Publish each _org.apache.isis.applib.services.iactn.Interaction.Execution_ immediately after it completes.
 
-Most implementations are expected to use _Interaction.Execution#getDto()_ to create a serializable XML representation of the execution. The easiest way to do this is using _InteractionDtoUtils#newInteractionDto(Interaction.Execution)_ . There is some flexibility here, though.
+Most implementations are expected to use _org.apache.isis.applib.services.iactn.Interaction.Execution#getDto()_ to create a serializable XML representation of the execution. The easiest way to do this is using _InteractionDtoUtils#newInteractionDto(Interaction.Execution)_ . There is some flexibility here, though.
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc b/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
index 468be97..aa89170 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
@@ -26,15 +26,15 @@ interface ServiceRegistry {
 }
 ----
 
-<.> `[teal]#*select*#<T>(Class<T> type, Annotation[] qualifiers)` : `Can<T>`
+<.> `[teal]#*select*#<T>(Class<T> type, Annotation[] qualifiers)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
 +
 --
-Obtains a _Can_ container containing any matching instances for the given required type and additional required qualifiers.
+Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type and additional required qualifiers.
 --
-<.> `[teal]#*select*#<T>(Class<T> type)` : `Can<T>`
+<.> `[teal]#*select*#<T>(Class<T> type)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
 +
 --
-Obtains a _Can_ container containing any matching instances for the given required type.
+Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type.
 --
 <.> `[teal]#*streamRegisteredBeansOfType*#(Class<?> requiredType)` : `Stream<_ManagedBeanAdapter>`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc b/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc
index aceabce..5938429 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc
@@ -1,7 +1,7 @@
 = Scratchpad : _interface_
 :Notice: 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 ag [...]
 
-This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same interaction. Most commonly this will be as the result of invoking a _org.apache.isis.applib.annotation.Bulk_ action.
+This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same interaction. Most commonly this will be as the result of invoking a bulk action.
 
 This implementation has only one implementation (this class) in applib, so it is annotated with _org.apache.isis.applib.annotation.DomainService_ . This means that it is automatically registered and available for use; no further configuration is required.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc
index 8f8f597..d421789 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc
@@ -1,6 +1,8 @@
 = SwaggerService : _interface_
 :Notice: 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 ag [...]
 
+The xref:system:generated:index/applib/services/swagger/SwaggerService.adoc[SwaggerService] generates Swagger schema definition files to describe the public and/or private RESTful APIs exposed by the RestfulObjects viewer.
+
 .Java Sources
 [source,java]
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc
index d4884b4..b4f2b89 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc
@@ -3,7 +3,7 @@
 
 The xref:system:generated:index/applib/services/user/UserService.adoc[UserService] allows the domain object to obtain the identity of the user interacting with said object.
 
-If _SudoService_ has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.
+If xref:system:generated:index/applib/services/sudo/SudoService.adoc[SudoService] has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc
index 00a88b5..b8f0609 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc
@@ -37,8 +37,6 @@ NOTE: domain classes may not have a method with this name. The `__isis_` prefix
 <.> `[teal]#*__isis_executionModes*#()` : `ImmutableEnumSet<xref:system:generated:index/applib/services/wrapper/control/ExecutionMode.adoc[ExecutionMode]>`
 +
 --
-The _EnumSetexecution modes_ inferred from the _SyncControl_ with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
-
-NOTE: domain classes may not have a method with this name. The `__isis_` prefix is intended to reduce the risk of a collision.
+The _EnumSetexecution modes_ inferred from the xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc
index 437e5bd..5600212 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc
@@ -24,6 +24,6 @@ Skip all business rules.
 --
 Skip actual execution.
 
-This is not supported for _WrapperFactory#asyncWrap(Object, AsyncControl)_ ; instead just invoke _WrapperFactory#wrap(Object, ImmutableEnumSet)_ .
+This is not supported for _WrapperFactory#asyncWrap(Object, AsyncControl)_ ; instead just invoke _WrapperFactory#wrap(Object, SyncControl)_ .
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc
index 885c2cb..618b488 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc
@@ -1,7 +1,7 @@
 = ActionInvocationEvent : _class_
 :Notice: 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 ag [...]
 
- _Supported only by _WrapperFactory_ service,_ represents a check as to whether a particular argument for an action is valid or not.
+ _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether a particular argument for an action is valid or not.
 
 If _#getReason()_ is not `null` then provides the reason why the set of arguments are invalid; otherwise the arguments are valid.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc
index 17aa569..d7db002 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc
@@ -1,7 +1,7 @@
 = ActionVisibilityEvent : _class_
 :Notice: 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 ag [...]
 
- _Supported only by _WrapperFactory_ service,_ represents a check as to whether an action is visible or has been hidden.
+ _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether an action is visible or has been hidden.
 
 If _#getReason()_ is not `null` then provides the reason why the action is invisible; otherwise action is visible.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc
index 94ae75d..316fc63 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc
@@ -80,14 +80,14 @@ Convenience method that returns the _Identifier#getClassName() class name_ of th
 <.> `[teal]#*getMemberParameterNaturalNames*#()` : `List<String>`
 +
 --
-As per _#getMemberParameterName()_ , but naturalized.
+As per _#getMemberParameterNames()_ , but naturalized.
 --
 <.> `[teal]#*getReason*#()` : `String`
 +
 --
 The reason, if any, that this interaction may have been vetoed or otherwise disallowed.
 
-Intended to be _#setExecuteIn(String) set_ as a result of consulting one of the facets.
+Intended to be _#advised(String, Class) set_ as a result of consulting one of the facets.
 --
 <.> `[teal]#*getReasonMessage*#()` : `String`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc
index 9a352fd..b89c99d 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc
@@ -1,7 +1,7 @@
 = VisibilityEvent : _class_
 :Notice: 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 ag [...]
 
- _Supported only by _WrapperFactory_ service,_ represents a check to determine whether a member of an object is visible or has been hidden.
+ _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check to determine whether a member of an object is visible or has been hidden.
 
 If _#getReason()_ is `null` , then is usable; otherwise is invisible.
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc
index ee0b5e7..3b984f6 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc
@@ -110,7 +110,7 @@ An object was removed from the collection (or an attempt to remove it was made).
 --
 A method of a collection (such as `isEmpty()` or `size()` ) has been invoked.
 
-Unlike the other methods in this interface, the source of these events will be an instance of a Collection (such as `java.util.List` ) rather than the domain object. (The domain object is {@link CollectionMethodEvent#getDomainObject() still available, however).
+Unlike the other methods in this interface, the source of these events will be an instance of a Collection (such as `java.util.List` ) rather than the domain object. (The domain object is _CollectionMethodEvent#getDomainObject()_ still available, however).
 --
 <.> `[teal]#*actionVisible*#(xref:system:generated:index/applib/services/wrapper/events/ActionVisibilityEvent.adoc[ActionVisibilityEvent] interactionEvent)` : `void`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
index 103bbbd..3d95463 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
@@ -42,7 +42,7 @@ More fine grained control is given via _#callTransactional(TransactionDefinition
 --
 Runs given _runnable_ with a transactional boundary, where the detailed transactional behavior is governed by given _Propagation_ _propagation_ .
 
-More fine grained control is given via _#runTransactional(TransactionDefinition, Callable)_
+More fine grained control is given via _#runTransactional(TransactionDefinition, ThrowingRunnable)_
 --
 <.> `[teal]#*callWithinCurrentTransactionElseCreateNew*#<T>(Callable<T> callable)` : `xref:system:generated:index/commons/functional/Result.adoc[Result]<T>`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc b/antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc
index eb3ba59..4fab569 100644
--- a/antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc
@@ -1,7 +1,7 @@
 = SnapshottableWithInclusions : _interface_
 :Notice: 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 ag [...]
 
-Optional interface for domain objects with which an snapshot is to be created using the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService] , indicating paths to be _XmlSnapshotService.Snapshot#_ automatically include additional paths within the snapshot.
+Optional interface for domain objects with which an snapshot is to be created using the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService] , indicating paths to be _org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot_ automatically include additional paths within the snapshot.
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc b/antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc
index 508c9ee..b53eb53 100644
--- a/antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc
@@ -1,7 +1,7 @@
 = MemberIdentifierType : _class_
 :Notice: 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 ag [...]
 
-As per _Command#getMemberIdentifier()_ and _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)_ .
+As per _Command#getLogicalMemberIdentifier()_ and _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)_ .
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc b/antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc
index a65026b..6ca5748 100644
--- a/antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc
@@ -1,7 +1,7 @@
 = TargetActionType : _class_
 :Notice: 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 ag [...]
 
-A user-friendly name of an action, as per _Command#getTargetAction()_ , _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)_ .
+A user-friendly name of an action, as per _Command#getTargetAction()_ , _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)_ .
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc b/antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc
index a123704..8e6a31b 100644
--- a/antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc
@@ -1,7 +1,7 @@
 = TargetClassType : _class_
 :Notice: 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 ag [...]
 
-A user-friendly name of a class, as per _Command#getTargetClass()_ , _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#audit(UUID, int, String, Bookmark, String, String, String, String, String, Timestamp)_ .
+A user-friendly name of a class, as per _Command#getTargetClass()_ , _org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscriber#onChanging(org.apache.isis.applib.services.publishing.spi.EntityPropertyChange)_ .
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc b/antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc
index 4accdee..a628190 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc
@@ -68,14 +68,14 @@ Creates a new, empty, xref:system:generated:index/applib/util/TitleBuffer.adoc[T
 --
 Creates a new xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*TitleBuffer*#(Object object, String defaultTitle)`
 +
 --
 Creates a new title object, containing the title of the specified object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*TitleBuffer*#(String text)`
 +
@@ -87,7 +87,7 @@ Creates a new title object, containing the specified text.
 --
 Determines if the specified object's title is empty (or null).
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*_isEmpty_*#(String text)` : `boolean`
 +
@@ -100,14 +100,14 @@ Determines if the specified text is empty. Will return true if either: the speci
 --
 Append the title of the specified object to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*append*#(Object object, String defaultValue)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
 --
 Appends the title of the specified object, or the specified text if the objects title is null or empty. Prepends a space if there is already some text in this title object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*append*#(String text)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
@@ -119,14 +119,14 @@ Appends a space (if there is already some text in this title object) and then th
 --
 Appends the joining string and the title of the specified object. If the object is empty then nothing will be appended.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*append*#(String joiner, Object object, String defaultTitle)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
 --
 Append thejoinertext, a space, and the title of the specified object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use thedefaultValuetext. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*append*#(String joiner, String text)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
@@ -148,7 +148,7 @@ Concatenate the the title value (the result of calling an objects label() method
 --
 Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*concat*#(String text)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
@@ -165,14 +165,14 @@ Concatenate the joiner text and the text to the text of this xref:system:generat
 --
 Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*concat*#(String joiner, Object object, String defaultValue)` : `xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer]`
 +
 --
 Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _org.apache.isis.applib.DomainObjectContainer#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 --
 <.> `[teal]#*toString*#()` : `String`
 +
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc b/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
index b31e896..59dc152 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
@@ -61,12 +61,12 @@ class InteractionDtoUtils {
 <.> `[teal]#*_newInteractionDto_*#(Execution<?, ?> execution)` : `InteractionDto`
 +
 --
-Creates a _InteractionDto_ (serializable to XML) for the provided _Interaction.Execution_ (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided _org.apache.isis.applib.services.iactn.Interaction.Execution_ (the applib object).
 --
 <.> `[teal]#*_newInteractionDto_*#(Execution<?, ?> execution, Strategy strategy)` : `InteractionDto`
 +
 --
-Creates a _InteractionDto_ (serializable to XML) for the provided _Interaction.Execution_ (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided _org.apache.isis.applib.services.iactn.Interaction.Execution_ (the applib object).
 --
 <.> `[teal]#*_addReturn_*#(ActionInvocationDto invocationDto, Class<?> returnType, Object result, xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[BookmarkService] bookmarkService)` : `void`
 
diff --git a/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc b/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
new file mode 100644
index 0000000..d3f258d
--- /dev/null
+++ b/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
@@ -0,0 +1,239 @@
+= Can : _interface_
+:Notice: 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 ag [...]
+
+Immutable _Iterable_ , that can specifically represent 3 possible variants of xref:system:generated:index/commons/collections/Cardinality.adoc[Cardinality] .
+
+Java's _Optional_ , can be seen as a holder of element(s), that is restricted to cardinality ZERO or ONE. xref:system:generated:index/commons/collections/Can.adoc[Can] is the logical extension to that, allowing also a cardinality of MULTIPLE.
+
+Same idiomatic convention applies: References to xref:system:generated:index/commons/collections/Can.adoc[Can] should never be initialized to _null_ .
+
+A xref:system:generated:index/commons/collections/Can.adoc[Can] must not contain elements equal to _null_ .
+
+.Java Sources
+[source,java]
+----
+interface Can {
+
+  Cardinality getCardinality() // <.>
+
+  int size() // <.>
+
+  Optional<T> get(int elementIndex) // <.>
+
+  T getElseFail(final int elementIndex) // <.>
+
+  int compareTo(final Can<T> o) // <.>
+
+  Stream<T> stream() // <.>
+
+  Stream<T> parallelStream() // <.>
+
+  Optional<T> getFirst() // <.>
+
+  T getFirstOrFail() // <.>
+
+  Optional<T> getSingleton() // <.>
+
+  T getSingletonOrFail() // <.>
+
+  boolean contains(T element) // <.>
+
+  Can<T> empty() // <.>
+
+  Can<T> ofNullable(T element) // <.>
+
+  Can<T> ofSingleton(T element) // <.>
+
+  Can<T> of(T... array)
+
+  Can<T> ofArray(T[] array)
+
+  Can<T> ofCollection(Collection<T> collection) // <.>
+
+  Can<T> ofIterable(Iterable<T> iterable)
+
+  Can<T> ofStream(Stream<T> stream) // <.>
+
+  Can<T> ofInstance(Instance<T> instance) // <.>
+
+  Can<T> reverse() // <.>
+
+  Can<T> filter(Predicate<? super T> predicate) // <.>
+
+  Can<R> map(Function<? super T, R> mapper) // <.>
+
+  Can<T> concat(Can<T> can, T element) // <.>
+
+  Iterator<T> reverseIterator()
+
+  void forEach(Consumer<? super T> action)
+
+  void zip(Iterable<R> zippedIn, BiConsumer<? super T, ? super R> action) // <.>
+
+  Can<R> zipMap(Iterable<Z> zippedIn, BiFunction<? super T, ? super Z, R> mapper) // <.>
+
+  Can<T> add(T element)
+
+  Can<T> addAll(Can<T> other)
+
+  Can<T> add(int index, T element) // <.>
+
+  Can<T> replace(int index, T element)
+
+  Can<T> remove(int index) // <.>
+
+  Can<T> remove(T element)
+
+  int indexOf(T element) // <.>
+
+  boolean isEqualTo(final Can<?> other) // <.>
+
+  boolean startsWith(final Can<?> other) // <.>
+
+  boolean endsWith(final Can<?> other) // <.>
+
+  boolean isEmpty()
+
+  boolean isNotEmpty()
+
+  boolean isCardinalityOne()
+
+  boolean isCardinalityMultiple()
+
+  Collector<T, ?, Can<T>> toCan()
+
+  List<T> toList() // <.>
+
+  C toCollection(Supplier<C> collectionFactory) // <.>
+
+  T[] toArray(T[] a) // <.>
+
+  T[] toArray(Class<T> elementType) // <.>
+}
+----
+
+<.> `[teal]#*getCardinality*#()` : `xref:system:generated:index/commons/collections/Cardinality.adoc[Cardinality]`
+<.> `[teal]#*size*#()` : `int`
+<.> `[teal]#*get*#(int elementIndex)` : `Optional<T>`
++
+--
+Will only ever return an empty Optional, if the elementIndex is out of bounds.
+--
+<.> `[teal]#*getElseFail*#(int elementIndex)` : `T`
++
+--
+Shortcut to _get(elementIndex).orElseThrow(...)_
+
+Will only ever throw, if the elementIndex is out of bounds.
+--
+<.> `[teal]#*compareTo*#(xref:system:generated:index/commons/collections/Can.adoc[Can]<T> o)` : `int`
++
+--
+For convenience allows the argument to be _null_ treating _null_ equivalent to _Can#empty()_ .
+--
+<.> `[teal]#*stream*#()` : `Stream<T>`
+<.> `[teal]#*parallelStream*#()` : `Stream<T>`
+<.> `[teal]#*getFirst*#()` : `Optional<T>`
+<.> `[teal]#*getFirstOrFail*#()` : `T`
++
+--
+Shortcut for _getFirst().orElseThrow(_Exceptions::noSuchElement)_
+--
+<.> `[teal]#*getSingleton*#()` : `Optional<T>`
+<.> `[teal]#*getSingletonOrFail*#()` : `T`
++
+--
+Shortcut for _getSingleton().orElseThrow(_Exceptions::noSuchElement)_
+--
+<.> `[teal]#*contains*#(T element)` : `boolean`
+<.> `[teal]#*_empty_*#<T>()` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns an empty _Can_ .
+--
+<.> `[teal]#*_ofNullable_*#<T>(T element)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns either a _Can_ with the given _element_ or an empty _Can_ if the _element_ is _null_ .
+--
+<.> `[teal]#*_ofSingleton_*#<T>(T element)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns either a _Can_ with the given _element_ or throws if the _element_ is _null_ .
+--
+<.> `[teal]#*_ofCollection_*#<T>(Collection<T> collection)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns either a _Can_ with all the elements from given _collection_ or an empty _Can_ if the _collection_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
+--
+<.> `[teal]#*_ofStream_*#<T>(Stream<T> stream)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns either a _Can_ with all the elements from given _stream_ or an empty _Can_ if the _stream_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
+--
+<.> `[teal]#*_ofInstance_*#<T>(Instance<T> instance)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns either a _Can_ with all the elements from given _instance_ or an empty _Can_ if the _instance_ is _null_ . Any elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
+--
+<.> `[teal]#*reverse*#()` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns a _Can_ with all the elements from this _Can_ but contained in reversed order.
+--
+<.> `[teal]#*filter*#(Predicate<? super T> predicate)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns a _Can_ with all the elements from this _Can_ , that are accepted by the given _predicate_ . If _predicate_ is _null_ *all* elements are accepted.
+--
+<.> `[teal]#*map*#<R>(Function<? super T, R> mapper)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<R>`
++
+--
+Returns a _Can_ with all the elements from this _Can_ 'transformed' by the given _mapper_ function. Any resulting elements equal to _null_ are ignored and will not be contained in the resulting _Can_ .
+--
+<.> `[teal]#*_concat_*#<T>(xref:system:generated:index/commons/collections/Can.adoc[Can]<T> can, T element)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Returns a _Can_ with all the elements from given _can_ joined by the given _element_ . If any of given _can_ or _element_ are _null_ these do not contribute any elements and are ignored.
+--
+<.> `[teal]#*zip*#<R>(Iterable<R> zippedIn, BiConsumer<? super T, ? super R> action)` : `void`
++
+--
+Similar to _#forEach(Consumer)_ , but zipps in _zippedIn_ to iterate through its elements and passes them over as the second argument to the _action_ .
+--
+<.> `[teal]#*zipMap*#<R, Z>(Iterable<Z> zippedIn, BiFunction<? super T, ? super Z, R> mapper)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<R>`
++
+--
+Similar to _#map(Function)_ , but zipps in _zippedIn_ to iterate through its elements and passes them over as the second argument to the _mapper_ .
+--
+<.> `[teal]#*add*#(int index, T element)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Inserts the specified element at the specified position in this list (optional operation). Shifts the element currently at that position (if any) and any subsequent elements to the right (adds one to their indices).
+--
+<.> `[teal]#*remove*#(int index)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
++
+--
+Removes the element at the specified position in this list (optional operation). Shifts any subsequent elements to the left (subtracts one from their indices). Returns the element that was removed from the list.
+--
+<.> `[teal]#*indexOf*#(T element)` : `int`
++
+--
+Returns the index of the first occurrence of the specified element in this list, or -1 if this list does not contain the element. More formally, returns the lowest index `i` such that `(o==null ? get(i)==null : o.equals(get(i)))` , or -1 if there is no such index.
+--
+<.> `[teal]#*isEqualTo*#(xref:system:generated:index/commons/collections/Can.adoc[Can]<?> other)` : `boolean`
+<.> `[teal]#*startsWith*#(xref:system:generated:index/commons/collections/Can.adoc[Can]<?> other)` : `boolean`
++
+--
+Let _n_ be the number of elements in _other_ . Returns whether the first _n_ elements of this _Can_ are element-wise equal to _other_ .
+--
+<.> `[teal]#*endsWith*#(xref:system:generated:index/commons/collections/Can.adoc[Can]<?> other)` : `boolean`
++
+--
+Let _n_ be the number of elements in _other_ . Returns whether the last _n_ elements of this _Can_ are element-wise equal to _other_ .
+--
+<.> `[teal]#*toList*#()` : `List<T>`
+<.> `[teal]#*toCollection*#<C>(Supplier<C> collectionFactory)` : `C`
+<.> `[teal]#*toArray*#(T[] a)` : `T[]`
+<.> `[teal]#*toArray*#(Class<T> elementType)` : `T[]`
+
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc b/antora/components/system/modules/generated/pages/index/commons/collections/Cardinality.adoc
similarity index 70%
copy from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
copy to antora/components/system/modules/generated/pages/index/commons/collections/Cardinality.adoc
index eac4516..34f120b 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
+++ b/antora/components/system/modules/generated/pages/index/commons/collections/Cardinality.adoc
@@ -1,18 +1,38 @@
-= MediaTypes : _class_
+= Cardinality : _enum_
 :Notice: 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 ag [...]
 
 .Java Sources
 [source,java]
 ----
-class MediaTypes {
+enum Cardinality {
 
-  MediaType parse(String type) // <.>
+  ZERO // <.>
+
+  ONE // <.>
+
+  MULTIPLE // <.>
+
+  boolean isZero()
+
+  boolean isOne()
+
+  boolean isMultiple()
 }
 ----
 
-<.> `[teal]#*_parse_*#(String type)` : `MediaType`
+<.> `[teal]#*_ZERO_*#`
++
+--
+The container is empty.
+--
+<.> `[teal]#*_ONE_*#`
++
+--
+The container has exactly one element.
+--
+<.> `[teal]#*_MULTIPLE_*#`
 +
 --
-Same as _MediaType.valueOf(type)_ , but with fallback in case _MediaType.valueOf(type)_ throws an IllegalArgumentException.The fallback is to retry with some special characters replaces in String _type_ .
+The container has at least two elements.
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc b/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
index 37c5aeb..fe7f23f 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
@@ -46,8 +46,8 @@ a-synchronous response failure processing
 <.> `[teal]#*isSuccess*#()` : `boolean`
 <.> `[teal]#*isFailure*#()` : `boolean`
 <.> `[teal]#*getEntity*#()` : `Optional<T>`
-<.> `[teal]#*getEntities*#()` : `Can<T>`
+<.> `[teal]#*getEntities*#()` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
 <.> `[teal]#*getFailureCause*#()` : `Exception`
 <.> `[teal]#*singletonOrElseMapFailure*#(Function<Exception, T> failureMapper)` : `T`
-<.> `[teal]#*multipleOrElseMapFailure*#(Function<Exception, Can<T>> failureMapper)` : `Can<T>`
+<.> `[teal]#*multipleOrElseMapFailure*#(Function<Exception, xref:system:generated:index/commons/collections/Can.adoc[Can]<T>> failureMapper)` : `xref:system:generated:index/commons/collections/Can.adoc[Can]<T>`
 
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
index af6517d..6d882a7 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
@@ -1,7 +1,7 @@
 = ApplicationPermission : _interface_
 :Notice: 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 ag [...]
 
-Specifies how a particular _#getRole() application role_ may interact with a specific _#getFeature() application feature_ .
+Specifies how a particular _#getRole() application role_ may interact with a specific _ApplicationFeature application feature_ .
 
 Each permission has a _#getRule() rule_ and a _#getMode() mode_ . The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] determines whether the permission _ApplicationPermissionRule#ALLOW grants_ access to the feature or _ApplicationPermissionRule#VETO veto_ es access to it. The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] indicates whether the rol [...]
 
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc
index 2e5f355..403a3ba 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc
@@ -1,7 +1,7 @@
 = AccountType : _enum_
 :Notice: 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 ag [...]
 
-Whether the user's account is local enabled (user/password) or delegated (eg LDAP), as per _IsisModuleSecurityRealm#setDelegateAuthenticationRealm(org.apache.shiro.realm.AuthenticatingRealm)_ .
+Whether the user's account is local enabled (user/password) or delegated (eg LDAP), as per _org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanShiroRealm#setDelegateAuthenticationRealm(org.apache.shiro.realm.AuthenticatingRealm)_ .
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
index 6d7e512..ddbca13 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
@@ -1,7 +1,7 @@
 = SeedUsersAndRolesFixtureScript : _class_
 :Notice: 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 ag [...]
 
-This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#init() init_ ( _javax.annotation.PostConstruct_ ) method.
+This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
index 19ed831..9d57c4c 100644
--- a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
+++ b/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
@@ -1,7 +1,7 @@
 = SeedUsersAndRolesFixtureScript : _class_
 :Notice: 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 ag [...]
 
-This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#init() init_ ( _javax.annotation.PostConstruct_ ) method.
+This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc
index a6b501b..49e88aa 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc
@@ -40,6 +40,6 @@ Parse a string representation of a LocalDateInterval Since this method is only u
 <.> `[teal]#*_endDateFromStartDate_*#(LocalDate date)` : `LocalDate`
 +
 --
-Returns an end date given the start date of the next adjoining interverval
+Returns an end date given the start date of the next adjoining interval
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc
index e3ad983..3eb886a 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc
@@ -1,7 +1,7 @@
 = ExcelFixture : _class_
 :Notice: 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 ag [...]
 
-This class should be executed using _FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE_ (it has value semantics).
+This class should be executed using _org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE_ (it has value semantics).
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
index ba53ac9..ccee691 100644
--- a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
+++ b/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
@@ -1,7 +1,7 @@
 = ExcelFixture2 : _class_
 :Notice: 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 ag [...]
 
-This class should be executed using _FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE_ (it has value semantics).
+This class should be executed using _org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_VALUE_ (it has value semantics).
 
 .Java Sources
 [source,java]
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
index eac4516..d527a4d 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
@@ -13,6 +13,8 @@ class MediaTypes {
 <.> `[teal]#*_parse_*#(String type)` : `MediaType`
 +
 --
-Same as _MediaType.valueOf(type)_ , but with fallback in case _MediaType.valueOf(type)_ throws an IllegalArgumentException.The fallback is to retry with some special characters replaces in String _type_ .
+Same as _MediaType.valueOf(type)_ , but with fallback in case _MediaType.valueOf(type)_ throws an IllegalArgumentException.
+
+The fallback is to retry with some special characters replaces in String _type_ .
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
index f5ae1a1..0c8ac85 100644
--- a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
+++ b/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
@@ -54,6 +54,6 @@ Action prompt is not supported.
 <.> `[teal]#*buildResponse*#(IResourceContext resourceContext, ObjectAndActionInvocation objectAndActionInvocation)` : `ResponseBuilder`
 +
 --
-Action invocation is supported provided it returns a single domain object or a list of domain objects (ie invocations returning void or scalar value are not supported). Action invocations returning a domain object will be rendered as a map with the RO v1.0 representation as a '$$ro' property within (same as _#buildResponse(RepresentationService.Context2, ManagedObject)_ ), while action invocations returning a list will be rendered as a list with the RO v1.0 representation as a map object [...]
+Action invocation is supported provided it returns a single domain object or a list of domain objects (ie invocations returning void or scalar value are not supported). Action invocations returning a domain object will be rendered as a map with the RO v1.0 representation as a '$$ro' property within (same as _#buildResponse(IResourceContext, ManagedObject)_ ), while action invocations returning a list will be rendered as a list with the RO v1.0 representation as a map object with a single [...]
 --
 
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/system/modules/generated/pages/system-overview.adoc
index cf5cbeb..5b18b1e 100644
--- a/antora/components/system/modules/generated/pages/system-overview.adoc
+++ b/antora/components/system/modules/generated/pages/system-overview.adoc
@@ -1203,7 +1203,7 @@ _Dependencies_
 
 _Document Index Entries_
 
-xref:system:generated:index/commons/functional/Result.adoc[Result], xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId], xref:system:generated:index/commons/having/HasUpdatedAt.adoc[HasUpdatedAt], xref:system:generated:index/commons/having/HasUpdatedBy.adoc[HasUpdatedBy], xref:system:generated:index/commons/having/HasUsername.adoc[HasUsername], xref:system:generated:index/commons/resource/ResourceCoordinates.adoc[ResourceCoordinates]
+xref:system:generated:index/commons/collections/Can.adoc[Can], xref:system:generated:index/commons/collections/Cardinality.adoc[Cardinality], xref:system:generated:index/commons/functional/Result.adoc[Result], xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId], xref:system:generated:index/commons/having/HasUpdatedAt.adoc[HasUpdatedAt], xref:system:generated:index/commons/having/HasUpdatedBy.adoc[HasUpdatedBy], xref:system:generated:index/commons/having/HasUsername.a [...]
 |===
 
 == Core
@@ -1415,7 +1415,6 @@ _Components_
 * o.a.i.core.config.beans.IsisBeanFactoryPostProcessorForSpring
 * o.a.i.core.config.beans.IsisBeanTypeRegistryDefault
 * o.a.i.core.config.converters.PatternsConverter
-* o.a.i.core.config.datasources.DataSourceIntrospectionService
 * o.a.i.core.config.environment.IsisLocaleInitializer
 * o.a.i.core.config.environment.IsisSystemEnvironment
 * o.a.i.core.config.environment.IsisTimeZoneInitializer
@@ -1548,7 +1547,7 @@ Folder: \core\runtime
 
 _Components_
 
-* o.a.i.core.runtime.events.MetamodelEventService
+* o.a.i.core.runtime.events.AppLifecycleEventService
 * o.a.i.core.runtime.events.TransactionEventEmitter
 
 _Dependencies_
@@ -1577,11 +1576,12 @@ _Components_
 * o.a.i.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
 * o.a.i.core.runtimeservices.email.EmailServiceDefault
 * o.a.i.core.runtimeservices.eventbus.EventBusServiceSpring
+* o.a.i.core.runtimeservices.exceprecog.ExceptionRecognizerServiceDefault
 * o.a.i.core.runtimeservices.executor.MemberExecutorServiceDefault
 * o.a.i.core.runtimeservices.factory.FactoryServiceDefault
 * o.a.i.core.runtimeservices.homepage.HomePageResolverServiceDefault
 * o.a.i.core.runtimeservices.i18n.po.TranslationServicePo
-* o.a.i.core.runtimeservices.interaction.InteractionDtoServiceInternalDefault
+* o.a.i.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
 * o.a.i.core.runtimeservices.jaxb.JaxbServiceDefault
 * o.a.i.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault
 * o.a.i.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3
@@ -1591,23 +1591,17 @@ _Components_
 * o.a.i.core.runtimeservices.publish.EntityPropertyChangePublisherDefault
 * o.a.i.core.runtimeservices.publish.ExecutionPublisherDefault
 * o.a.i.core.runtimeservices.queryresultscache.QueryResultsCacheDefault
-* o.a.i.core.runtimeservices.recognizer.ExceptionRecognizerServiceDefault
-* o.a.i.core.runtimeservices.recognizer.dae.impl.ExceptionRecognizerForDataAlreadyExists
-* o.a.i.core.runtimeservices.recognizer.dae.impl.ExceptionRecognizerForObjectNotFound
-* o.a.i.core.runtimeservices.recognizer.dae.impl.ExceptionRecognizerForOtherDataAccessProblem
-* o.a.i.core.runtimeservices.recognizer.dae.impl.ExceptionRecognizerForRelatedDataExists
-* o.a.i.core.runtimeservices.recognizer.dae.impl.ExceptionRecognizerForUnableToSaveData
 * o.a.i.core.runtimeservices.repository.RepositoryServiceDefault
 * o.a.i.core.runtimeservices.routing.RoutingServiceDefault
 * o.a.i.core.runtimeservices.scratchpad.ScratchpadDefault
 * o.a.i.core.runtimeservices.session.InteractionFactoryDefault
 * o.a.i.core.runtimeservices.sudo.SudoServiceDefault
-* o.a.i.core.runtimeservices.transaction.TransactionServiceSpring
 * o.a.i.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression
 * o.a.i.core.runtimeservices.user.UserServiceDefault
 * o.a.i.core.runtimeservices.userprof.UserProfileServiceDefault
 * o.a.i.core.runtimeservices.userreg.EmailNotificationServiceDefault
 * o.a.i.core.runtimeservices.wrapper.WrapperFactoryDefault
+* o.a.i.core.runtimeservices.xactn.TransactionServiceSpring
 * o.a.i.core.runtimeservices.xml.XmlServiceDefault
 * o.a.i.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault
 
@@ -1864,10 +1858,12 @@ Folder: \persistence\jdo\datanucleus
 _Components_
 
 * o.a.i.persistence.jdo.datanucleus.config.DnEntityDiscoveryListener
+* o.a.i.persistence.jdo.datanucleus.config.DnSettings
 * o.a.i.persistence.jdo.datanucleus.entities.DnEntityStateProvider
-* o.a.i.persistence.jdo.datanucleus.jdosupport.JdoSupportServiceDefault
-* o.a.i.persistence.jdo.datanucleus.metamodel.JdoDataNucleusProgrammingModel
-* o.a.i.persistence.jdo.datanucleus.schema.JdoSchemaService
+* o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreException
+* o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException
+* o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDOObjectNotFoundException
+* o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException
 
 _Dependencies_
 
@@ -1897,6 +1893,12 @@ Folder: \persistence\jdo\integration
 ----
 |JDO Integration (powered by DataNucleus)
 
+_Components_
+
+* o.a.i.persistence.jdo.integration.jdosupport.IsisJdoSupportDN5
+* o.a.i.persistence.jdo.integration.metamodel.JdoIntegrationProgrammingModel
+* o.a.i.persistence.jdo.integration.schema.JdoSchemaService
+
 _Dependencies_
 
 * org.apache.isis.commons:isis-commons:jar:<managed>
@@ -2115,10 +2117,6 @@ Folder: \persistence\jpa\metamodel
 ----
 |JPA Metamodel Facets / Programming Model
 
-_Components_
-
-* o.a.i.persistence.jpa.metamodel.JpaProgrammingModel
-
 _Dependencies_
 
 * org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
@@ -3510,12 +3508,12 @@ skinparam {
   maxMessageSize 100
 }
 hide stereotype
-skinparam rectangle<<11>> {
+skinparam rectangle<<22>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<22>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -3997,15 +3995,7 @@ Artifact: isis-extensions-secman-persistence-jpa
 Type: jar
 Folder: \extensions\security\secman\persistence-jpa
 ----
-|_Components_
-
-* o.a.i.extensions.secman.jpa.dom.permission.ApplicationPermissionRepository
-* o.a.i.extensions.secman.jpa.dom.role.ApplicationRoleRepository
-* o.a.i.extensions.secman.jpa.dom.tenancy.ApplicationTenancyRepository
-* o.a.i.extensions.secman.jpa.dom.user.ApplicationUserRepository
-* o.a.i.extensions.secman.jpa.seed.SeedSecurityModuleService
-
-_Dependencies_
+|_Dependencies_
 
 * org.apache.isis.core:isis-core-runtime:jar:<managed>
 * org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed>