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 2022/04/27 05:50:40 UTC

[isis] branch master updated (a33f2d826c -> 92634b0f1d)

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

ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


    from a33f2d826c ISIS-2297: fixes flipped nullability marker in AopPatch
     new 0c073e5239 ISIS-2297: java-doc fixes
     new 3cc79855c5 ISIS-3020: adds @MultivariateParameterSupport annot.
     new 92634b0f1d ISIS-3020: update site-index

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../pages/index/annotation/DomainService.adoc      |   18 +-
 .../annotation/MultivariateParameterSupport.adoc   |   33 +
 .../exceprecog/RootCauseFinder.adoc}               |   11 +-
 .../runtimeservices/spring}/BeanDescriptor.adoc    |    0
 .../runtimeservices/spring}/ContextBeans.adoc      |    0
 .../spring}/SpringBeansService.adoc                |    0
 .../CommandSubscriberForCommandLog.adoc}           |    6 +-
 .../command/ui/CommandLogServiceMenu.adoc}         |   13 +-
 .../primary/IsisModuleExtCommandReplayPrimary.adoc |    2 +
 .../restapi/CommandRetrievalOnPrimaryService.adoc} |   23 +-
 .../primary/restapi/CommandRetrievalService.adoc   |   27 -
 .../primary/ui/CommandReplayOnPrimaryService.adoc  |    1 -
 .../IsisModuleExtCommandReplaySecondary.adoc       |    2 +
 .../secondary/analyser/CommandReplayAnalyser.adoc  |    8 +-
 .../analyser/CommandReplayAnalyserException.adoc   |    2 +-
 .../analyser/CommandReplayAnalyserResult.adoc      |    2 +-
 .../analysis/CommandReplayAnalysisService.adoc     |    8 +-
 .../secondary/fetch/CommandFetcher.adoc            |   10 +-
 ...dModel_exclude.adoc => CommandLog_exclude.adoc} |    8 +-
 ...eplayQueue.adoc => CommandLog_replayQueue.adoc} |    8 +-
 .../secondary/{ => status}/SecondaryStatus.adoc    |    0
 .../ui/CommandReplayOnSecondaryService.adoc        |    1 -
 .../applib/IsisModuleExtExcelApplib.adoc}          |    6 +-
 .../index/excel/applib/dom/AggregationType.adoc    |    0
 .../excel/applib/dom/ExcelMetaDataEnabled.adoc     |    0
 .../pages/index/excel/applib/dom/ExcelService.adoc |    0
 .../pages/index/excel/applib/dom/HyperLink.adoc    |    0
 .../pages/index/excel/applib/dom/PivotColumn.adoc  |    0
 .../index/excel/applib/dom/PivotDecoration.adoc    |    0
 .../pages/index/excel/applib/dom/PivotRow.adoc     |    0
 .../pages/index/excel/applib/dom/PivotValue.adoc   |    0
 .../pages/index/excel/applib/dom/RowHandler.adoc   |    0
 .../index/excel/applib/dom/WorksheetContent.adoc   |    0
 .../index/excel/applib/dom/WorksheetSpec.adoc      |    0
 .../index/excel/applib/util/AnnotationList.adoc    |    0
 .../index/excel/applib/util/AnnotationTriplet.adoc |    0
 .../excel/applib/util/ExcelFileBlobConverter.adoc  |    0
 .../pages/index/excel/applib/util/Mode.adoc        |    0
 .../pages/index/excel/applib/util/PivotUtils.adoc  |    0
 .../index/excel/applib/util/SheetPivoter.adoc      |    0
 .../pages/index/excel/testing/ExcelFixture.adoc    |    0
 .../pages/index/excel/testing/ExcelFixture2.adoc   |    0
 .../excel/testing/ExcelFixtureRowHandler.adoc      |    0
 .../excel/testing/ExcelFixtureWorkbookHandler.adoc |    0
 .../excel/testing/FixtureAwareRowHandler.adoc      |    0
 .../excel/testing/IsisModuleExtExcelTesting.adoc}  |    7 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc  |    1 -
 .../applib/IsisModuleExtJaxRsClientApplib.adoc     |   12 -
 .../jaxrsclient/applib/client/JaxRsClient.adoc     |   14 -
 .../jaxrsclient/applib/client/JaxRsResponse.adoc   |   14 -
 .../index/restclient/IsisModuleExtRestClient.adoc  |   12 -
 .../pages/index/restclient/ResponseDigest.adoc     |   82 -
 .../index/restclient/RestfulClientException.adoc   |   16 -
 .../index/jdo/applib/types/LogicalTypeName.adoc    |    2 +-
 .../index/jdo/applib/types/ObjectIdentifier.adoc   |    2 +-
 .../pages/index/base/applib/Chained.adoc           |   40 -
 .../subdomains/pages/index/base/applib/Dflt.adoc   |   13 -
 .../applib/IsisModuleSubdomainsBaseApplib.adoc     |   12 -
 .../pages/index/base/applib/PowerType.adoc         |   15 -
 .../subdomains/pages/index/base/applib/Titled.adoc |   13 -
 .../pages/index/base/applib/TitledEnum.adoc        |   14 -
 .../base/applib/services/BaseServicesModule.adoc   |   12 -
 .../applib/services/calendar/CalendarService.adoc  |   49 -
 .../pages/index/base/applib/types/AddressLine.adoc |   23 -
 .../pages/index/base/applib/types/Description.adoc |   28 -
 .../pages/index/base/applib/types/Email.adoc       |   55 -
 .../pages/index/base/applib/types/Fqcn.adoc        |   23 -
 .../index/base/applib/types/LogicalTypeName.adoc   |   23 -
 .../pages/index/base/applib/types/Money.adoc       |   24 -
 .../pages/index/base/applib/types/Name.adoc        |   23 -
 .../pages/index/base/applib/types/Notes.adoc       |   28 -
 .../index/base/applib/types/ObjectIdentifier.adoc  |   23 -
 .../pages/index/base/applib/types/Percentage.adoc  |   24 -
 .../pages/index/base/applib/types/PhoneNumber.adoc |   33 -
 .../pages/index/base/applib/types/PostalCode.adoc  |   23 -
 .../pages/index/base/applib/types/ProperName.adoc  |   23 -
 .../pages/index/base/applib/types/Reference.adoc   |   33 -
 .../pages/index/base/applib/types/Title.adoc       |   23 -
 .../pages/index/base/applib/types/UrlTemplate.adoc |   23 -
 .../pages/index/base/applib/types/Username.adoc    |   23 -
 .../pages/index/base/applib/utils/ClassUtils.adoc  |   13 -
 .../index/base/applib/utils/JodaPeriodUtils.adoc   |   17 -
 .../pages/index/base/applib/utils/MathUtils.adoc   |   20 -
 .../index/base/applib/utils/MessageUtils.adoc      |   13 -
 .../pages/index/base/applib/utils/StringUtils.adoc |   17 -
 .../index/base/applib/utils/TitleBuilder.adoc      |   20 -
 .../base/applib/valuetypes/AbstractInterval.adoc   |   93 -
 .../base/applib/valuetypes/LocalDateInterval.adoc  |   46 -
 .../pages/index/base/applib/valuetypes/VT.adoc     |   50 -
 .../index/base/applib/with/WithCodeComparable.adoc |   13 -
 .../index/base/applib/with/WithCodeGetter.adoc     |   15 -
 .../index/base/applib/with/WithCodeUnique.adoc     |   12 -
 .../applib/with/WithDescriptionComparable.adoc     |   13 -
 .../base/applib/with/WithDescriptionGetter.adoc    |   15 -
 .../base/applib/with/WithDescriptionUnique.adoc    |   12 -
 .../pages/index/base/applib/with/WithInterval.adoc |   45 -
 .../base/applib/with/WithIntervalContiguous.adoc   |   57 -
 .../base/applib/with/WithIntervalMutable.adoc      |   16 -
 .../index/base/applib/with/WithNameComparable.adoc |   13 -
 .../index/base/applib/with/WithNameGetter.adoc     |   15 -
 .../index/base/applib/with/WithNameUnique.adoc     |   12 -
 .../base/applib/with/WithReferenceComparable.adoc  |   13 -
 .../base/applib/with/WithReferenceGetter.adoc      |   15 -
 .../base/applib/with/WithReferenceUnique.adoc      |   12 -
 .../pages/index/base/applib/with/WithSequence.adoc |   14 -
 .../index/base/applib/with/WithStartDate.adoc      |   14 -
 .../base/applib/with/WithTitleComparable.adoc      |   13 -
 .../index/base/applib/with/WithTitleGetter.adoc    |   15 -
 .../index/base/applib/with/WithTitleUnique.adoc    |   12 -
 .../pages/index/docx/applib/DocxService.adoc       |   40 -
 .../index/docx/applib/DocxService~MergeParams.adoc |   12 -
 .../applib/IsisModuleSubdomainsExcelApplib.adoc    |   13 -
 .../testing/IsisModuleSubdomainsExcelTesting.adoc  |   12 -
 .../applib/IsisModuleSubdomainsSpringApplib.adoc   |   12 -
 .../IsisModuleSubdomainsXDocReportApplib.adoc      |   12 -
 .../index/xdocreport/applib/XDocReportService.adoc |   13 -
 .../applib/XDocReportService~XDocReportModel.adoc  |   13 -
 .../applib/classrules/ArchitectureDomainRules.adoc |   11 -
 .../applib/fixturescripts/FixtureScript.adoc       |    2 +-
 .../applib/modules/ModuleWithFixturesService.adoc  |    1 -
 .../index/h2console/ui/services/H2ManagerMenu.adoc |    1 -
 .../client}/ActionParameterListBuilder.adoc        |    0
 .../restfulobjects/client}/RestfulClient.adoc      |   41 +-
 .../client}/RestfulClientConfig.adoc               |    0
 .../client}/auth/BasicAuthFilter.adoc              |    0
 .../client}/log/ClientConversationFilter.adoc      |    0
 .../client}/log/ClientConversationLogger.adoc      |    0
 ...port.java => MultivariateParameterSupport.java} |   23 +-
 .../isis/commons/internal/primitives/_Doubles.java |    4 +-
 core/adoc/modules/_overview/pages/about.adoc       | 1933 +++++++-------------
 .../actions/action/ActionOverloadingValidator.java |   11 +-
 131 files changed, 841 insertions(+), 2922 deletions(-)
 create mode 100644 antora/components/refguide-index/modules/applib/pages/index/annotation/MultivariateParameterSupport.adoc
 copy antora/components/refguide-index/modules/applib/pages/index/{layout/grid/bootstrap/BSClearFixHidden.adoc => services/exceprecog/RootCauseFinder.adoc} (80%)
 rename antora/components/refguide-index/modules/{subdomains/pages/index/spring/applib/service => core/pages/index/runtimeservices/spring}/BeanDescriptor.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains/pages/index/spring/applib/service => core/pages/index/runtimeservices/spring}/ContextBeans.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains/pages/index/spring/applib/service => core/pages/index/runtimeservices/spring}/SpringBeansService.adoc (100%)
 rename antora/components/refguide-index/modules/extensions/pages/index/commandlog/{jdo/CommandSubscriberForJdo.adoc => applib/command/subscriber/CommandSubscriberForCommandLog.adoc} (88%)
 rename antora/components/refguide-index/modules/extensions/pages/index/commandlog/{jdo/ui/CommandServiceMenu.adoc => applib/command/ui/CommandLogServiceMenu.adoc} (78%)
 copy antora/components/refguide-index/modules/{testing/pages/index/fakedata/applib/services/IsisPasswords.adoc => extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.adoc} (50%)
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
 rename antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/{CommandModel_exclude.adoc => CommandLog_exclude.adoc} (89%)
 rename antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/{CommandJdo_replayQueue.adoc => CommandLog_replayQueue.adoc} (86%)
 rename antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/{ => status}/SecondaryStatus.adoc (100%)
 copy antora/components/refguide-index/modules/extensions/pages/index/{hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc => excel/applib/IsisModuleExtExcelApplib.adoc} (90%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/AggregationType.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/ExcelService.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/HyperLink.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/PivotColumn.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/PivotDecoration.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/PivotRow.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/PivotValue.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/RowHandler.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/WorksheetContent.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/dom/WorksheetSpec.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/AnnotationList.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/AnnotationTriplet.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/ExcelFileBlobConverter.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/Mode.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/PivotUtils.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/applib/util/SheetPivoter.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/testing/ExcelFixture.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/testing/ExcelFixture2.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/testing/ExcelFixtureRowHandler.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc (100%)
 rename antora/components/refguide-index/modules/{subdomains => extensions}/pages/index/excel/testing/FixtureAwareRowHandler.adoc (100%)
 copy antora/components/refguide-index/modules/{applib/pages/index/layout/component/Owned.adoc => extensions/pages/index/excel/testing/IsisModuleExtExcelTesting.adoc} (89%)
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/restclient/ResponseDigest.adoc
 delete mode 100644 antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientException.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Chained.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Dflt.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/PowerType.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Titled.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/AddressLine.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Description.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Email.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Fqcn.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/LogicalTypeName.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Money.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Name.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Notes.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ObjectIdentifier.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Percentage.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PhoneNumber.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PostalCode.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ProperName.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Reference.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Title.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UrlTemplate.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Username.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService~MergeParams.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService.adoc
 delete mode 100644 antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService~XDocReportModel.adoc
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/ActionParameterListBuilder.adoc (100%)
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/RestfulClient.adoc (55%)
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/RestfulClientConfig.adoc (100%)
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/auth/BasicAuthFilter.adoc (100%)
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/log/ClientConversationFilter.adoc (100%)
 rename antora/components/refguide-index/modules/{extensions/pages/index/restclient => viewer/pages/index/restfulobjects/client}/log/ClientConversationLogger.adoc (100%)
 copy api/applib/src/main/java/org/apache/isis/applib/annotation/{ObjectSupport.java => MultivariateParameterSupport.java} (63%)


[isis] 01/03: ISIS-2297: java-doc fixes

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

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

commit 0c073e5239b22b88fd5db06a393295d7b277efe2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 27 07:27:26 2022 +0200

    ISIS-2297: java-doc fixes
---
 .../org/apache/isis/commons/internal/primitives/_Doubles.java |  4 ++--
 .../facets/actions/action/ActionOverloadingValidator.java     | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Doubles.java b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Doubles.java
index 5767fd6592..f30be3e948 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Doubles.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/primitives/_Doubles.java
@@ -44,7 +44,7 @@ public class _Doubles {
     /**
      * Ignores precision loss.
      * @throws ArithmeticException
-     *      if {@code decimal} cannot not be approximated by {@link Double}.
+     *      if {@code decimal} cannot be approximated by {@link Double}.
      * @apiNote specifically not using {@link OptionalDouble} as result type here,
      * based on how this method is used from value semantics
      */
@@ -56,7 +56,7 @@ public class _Doubles {
     /**
      * Ignores precision loss.
      * @throws ArithmeticException
-     *      if {@code decimal} cannot not be approximated by {@link Double}.
+     *      if {@code decimal} cannot be approximated by {@link Double}.
      */
     public double convertToDouble(final @NonNull BigDecimal decimal) {
         val doubleValue = decimal.doubleValue();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionOverloadingValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
index 1afb94724c..1c0cc14ebc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionOverloadingValidator.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.action;
 import javax.inject.Inject;
 
 import org.apache.isis.applib.services.metamodel.BeanSort;
+import org.apache.isis.commons.internal.base._Blackhole;
 import org.apache.isis.commons.internal.collections._Sets;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.spec.ActionScope;
@@ -56,10 +57,12 @@ extends MetaModelVisitingValidatorAbstract {
 
             val overloadedNames = _Sets.<String>newHashSet();
 
-            spec.streamActions(ActionScope.ANY, MixedIn.EXCLUDED, oa->{
-                overloadedNames.add(oa.getFeatureIdentifier().getMemberLogicalName());
-            })
-            .count(); // consumer the stream
+            _Blackhole.consume( // not strictly required, just to mark this as call with side-effects
+                spec.streamActions(ActionScope.ANY, MixedIn.EXCLUDED, oa->{
+                    overloadedNames.add(oa.getFeatureIdentifier().getMemberLogicalName());
+                })
+                .count() // consumes the stream
+            );
 
             if(!overloadedNames.isEmpty()) {
 


[isis] 02/03: ISIS-3020: adds @MultivariateParameterSupport annot.

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

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

commit 3cc79855c535c216e2053d7126360a1fc8fcff83
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 27 07:41:03 2022 +0200

    ISIS-3020: adds @MultivariateParameterSupport annot.
---
 .../annotation/MultivariateParameterSupport.java   | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/MultivariateParameterSupport.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MultivariateParameterSupport.java
new file mode 100644
index 0000000000..3cf178176b
--- /dev/null
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/MultivariateParameterSupport.java
@@ -0,0 +1,57 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.applib.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that a method is supporting an <i>Action</i> parameter,
+ * while allowing for one or more than one arguments to be passed in.
+ * <p>
+ * Following method templates are supported to receive a {@link MultivariateParameterSupport} annotation:
+ * <ul><li>hideNXxx</li><li>disableNXxx</li><li>choicesNXxx</li><li>autoCompleteNXxx</li><li>validateNXxx</li></ul>
+ * <p>
+ * By placing the {@link MultivariateParameterSupport} annotation on a method,
+ * a contract with the meta-model is enforced,
+ * such that this method must be recognized by the meta-model and cannot be ignored.
+ * <p>
+ * It was introduced to allow compatibility with the <i>Apache Isis v1</i> programming model
+ * and is likely going to be phased out with later releases.
+ *
+ * @since 2.0 {@index}
+ * @see MemberSupport
+ * @see ObjectSupport
+ * @see ObjectLifecycle
+ * @see Programmatic
+ * @deprecated likely to be phased out with later releases, while there is yet no definitive schedule
+ */
+@Deprecated(since = "2.0.0-RC1")
+@Inherited
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@Domain.Include // meta annotation, in support of meta-model validation
+public @interface MultivariateParameterSupport {
+
+}
+
+


[isis] 03/03: ISIS-3020: update site-index

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

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

commit 92634b0f1d345d4309595aecd16a184bf2fd2d1d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 27 07:50:35 2022 +0200

    ISIS-3020: update site-index
---
 .../pages/index/annotation/DomainService.adoc      |   18 +-
 .../annotation/MultivariateParameterSupport.adoc   |   33 +
 .../services/exceprecog/RootCauseFinder.adoc}      |   11 +-
 .../runtimeservices/spring}/BeanDescriptor.adoc    |    0
 .../runtimeservices/spring}/ContextBeans.adoc      |    0
 .../spring}/SpringBeansService.adoc                |    0
 .../CommandSubscriberForCommandLog.adoc}           |    6 +-
 .../command/ui/CommandLogServiceMenu.adoc}         |   13 +-
 .../primary/IsisModuleExtCommandReplayPrimary.adoc |    2 +
 .../restapi/CommandRetrievalOnPrimaryService.adoc  |   26 +
 .../primary/restapi/CommandRetrievalService.adoc   |   27 -
 .../primary/ui/CommandReplayOnPrimaryService.adoc  |    1 -
 .../IsisModuleExtCommandReplaySecondary.adoc       |    2 +
 .../secondary/analyser/CommandReplayAnalyser.adoc  |    8 +-
 .../analyser/CommandReplayAnalyserException.adoc   |    2 +-
 .../analyser/CommandReplayAnalyserResult.adoc      |    2 +-
 .../analysis/CommandReplayAnalysisService.adoc     |    8 +-
 .../secondary/fetch/CommandFetcher.adoc            |   10 +-
 ...dModel_exclude.adoc => CommandLog_exclude.adoc} |    8 +-
 ...eplayQueue.adoc => CommandLog_replayQueue.adoc} |    8 +-
 .../secondary/{ => status}/SecondaryStatus.adoc    |    0
 .../ui/CommandReplayOnSecondaryService.adoc        |    1 -
 .../excel/applib/IsisModuleExtExcelApplib.adoc}    |    6 +-
 .../index/excel/applib/dom/AggregationType.adoc    |    0
 .../excel/applib/dom/ExcelMetaDataEnabled.adoc     |    0
 .../pages/index/excel/applib/dom/ExcelService.adoc |    0
 .../pages/index/excel/applib/dom/HyperLink.adoc    |    0
 .../pages/index/excel/applib/dom/PivotColumn.adoc  |    0
 .../index/excel/applib/dom/PivotDecoration.adoc    |    0
 .../pages/index/excel/applib/dom/PivotRow.adoc     |    0
 .../pages/index/excel/applib/dom/PivotValue.adoc   |    0
 .../pages/index/excel/applib/dom/RowHandler.adoc   |    0
 .../index/excel/applib/dom/WorksheetContent.adoc   |    0
 .../index/excel/applib/dom/WorksheetSpec.adoc      |    0
 .../index/excel/applib/util/AnnotationList.adoc    |    0
 .../index/excel/applib/util/AnnotationTriplet.adoc |    0
 .../excel/applib/util/ExcelFileBlobConverter.adoc  |    0
 .../pages/index/excel/applib/util/Mode.adoc        |    0
 .../pages/index/excel/applib/util/PivotUtils.adoc  |    0
 .../index/excel/applib/util/SheetPivoter.adoc      |    0
 .../pages/index/excel/testing/ExcelFixture.adoc    |    0
 .../pages/index/excel/testing/ExcelFixture2.adoc   |    0
 .../excel/testing/ExcelFixtureRowHandler.adoc      |    0
 .../excel/testing/ExcelFixtureWorkbookHandler.adoc |    0
 .../excel/testing/FixtureAwareRowHandler.adoc      |    0
 .../testing/IsisModuleExtExcelTesting.adoc}        |    6 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc  |    1 -
 .../applib/IsisModuleExtJaxRsClientApplib.adoc     |   12 -
 .../jaxrsclient/applib/client/JaxRsClient.adoc     |   14 -
 .../jaxrsclient/applib/client/JaxRsResponse.adoc   |   14 -
 .../pages/index/restclient/ResponseDigest.adoc     |   82 -
 .../index/restclient/RestfulClientException.adoc   |   16 -
 .../index/jdo/applib/types/LogicalTypeName.adoc    |    2 +-
 .../index/jdo/applib/types/ObjectIdentifier.adoc   |    2 +-
 .../pages/index/base/applib/Chained.adoc           |   40 -
 .../subdomains/pages/index/base/applib/Dflt.adoc   |   13 -
 .../applib/IsisModuleSubdomainsBaseApplib.adoc     |   12 -
 .../pages/index/base/applib/PowerType.adoc         |   15 -
 .../subdomains/pages/index/base/applib/Titled.adoc |   13 -
 .../pages/index/base/applib/TitledEnum.adoc        |   14 -
 .../base/applib/services/BaseServicesModule.adoc   |   12 -
 .../applib/services/calendar/CalendarService.adoc  |   49 -
 .../pages/index/base/applib/types/AddressLine.adoc |   23 -
 .../pages/index/base/applib/types/Description.adoc |   28 -
 .../pages/index/base/applib/types/Email.adoc       |   55 -
 .../pages/index/base/applib/types/Fqcn.adoc        |   23 -
 .../index/base/applib/types/LogicalTypeName.adoc   |   23 -
 .../pages/index/base/applib/types/Money.adoc       |   24 -
 .../pages/index/base/applib/types/Name.adoc        |   23 -
 .../pages/index/base/applib/types/Notes.adoc       |   28 -
 .../index/base/applib/types/ObjectIdentifier.adoc  |   23 -
 .../pages/index/base/applib/types/Percentage.adoc  |   24 -
 .../pages/index/base/applib/types/PhoneNumber.adoc |   33 -
 .../pages/index/base/applib/types/PostalCode.adoc  |   23 -
 .../pages/index/base/applib/types/ProperName.adoc  |   23 -
 .../pages/index/base/applib/types/Reference.adoc   |   33 -
 .../pages/index/base/applib/types/Title.adoc       |   23 -
 .../pages/index/base/applib/types/UrlTemplate.adoc |   23 -
 .../pages/index/base/applib/types/Username.adoc    |   23 -
 .../pages/index/base/applib/utils/ClassUtils.adoc  |   13 -
 .../index/base/applib/utils/JodaPeriodUtils.adoc   |   17 -
 .../pages/index/base/applib/utils/MathUtils.adoc   |   20 -
 .../index/base/applib/utils/MessageUtils.adoc      |   13 -
 .../pages/index/base/applib/utils/StringUtils.adoc |   17 -
 .../index/base/applib/utils/TitleBuilder.adoc      |   20 -
 .../base/applib/valuetypes/AbstractInterval.adoc   |   93 -
 .../base/applib/valuetypes/LocalDateInterval.adoc  |   46 -
 .../pages/index/base/applib/valuetypes/VT.adoc     |   50 -
 .../index/base/applib/with/WithCodeComparable.adoc |   13 -
 .../index/base/applib/with/WithCodeUnique.adoc     |   12 -
 .../applib/with/WithDescriptionComparable.adoc     |   13 -
 .../base/applib/with/WithDescriptionGetter.adoc    |   15 -
 .../base/applib/with/WithDescriptionUnique.adoc    |   12 -
 .../pages/index/base/applib/with/WithInterval.adoc |   45 -
 .../base/applib/with/WithIntervalContiguous.adoc   |   57 -
 .../base/applib/with/WithIntervalMutable.adoc      |   16 -
 .../index/base/applib/with/WithNameComparable.adoc |   13 -
 .../index/base/applib/with/WithNameGetter.adoc     |   15 -
 .../index/base/applib/with/WithNameUnique.adoc     |   12 -
 .../base/applib/with/WithReferenceComparable.adoc  |   13 -
 .../base/applib/with/WithReferenceGetter.adoc      |   15 -
 .../base/applib/with/WithReferenceUnique.adoc      |   12 -
 .../pages/index/base/applib/with/WithSequence.adoc |   14 -
 .../index/base/applib/with/WithStartDate.adoc      |   14 -
 .../base/applib/with/WithTitleComparable.adoc      |   13 -
 .../index/base/applib/with/WithTitleGetter.adoc    |   15 -
 .../index/base/applib/with/WithTitleUnique.adoc    |   12 -
 .../pages/index/docx/applib/DocxService.adoc       |   40 -
 .../index/docx/applib/DocxService~MergeParams.adoc |   12 -
 .../testing/IsisModuleSubdomainsExcelTesting.adoc  |   12 -
 .../applib/IsisModuleSubdomainsSpringApplib.adoc   |   12 -
 .../IsisModuleSubdomainsXDocReportApplib.adoc      |   12 -
 .../index/xdocreport/applib/XDocReportService.adoc |   13 -
 .../applib/XDocReportService~XDocReportModel.adoc  |   13 -
 .../applib/classrules/ArchitectureDomainRules.adoc |   11 -
 .../applib/fixturescripts/FixtureScript.adoc       |    2 +-
 .../applib/modules/ModuleWithFixturesService.adoc  |    1 -
 .../index/h2console/ui/services/H2ManagerMenu.adoc |    1 -
 .../client}/ActionParameterListBuilder.adoc        |    0
 .../restfulobjects/client}/RestfulClient.adoc      |   41 +-
 .../client}/RestfulClientConfig.adoc               |    0
 .../client}/auth/BasicAuthFilter.adoc              |    0
 .../client}/log/ClientConversationFilter.adoc      |    0
 .../client}/log/ClientConversationLogger.adoc      |    0
 core/adoc/modules/_overview/pages/about.adoc       | 1933 +++++++-------------
 125 files changed, 834 insertions(+), 2853 deletions(-)

diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
index eb39e9838b..84523815c5 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
@@ -12,7 +12,7 @@ Also indicates whether the domain service acts as a repository for an entity, an
 ----
 @interface DomainService {
   NatureOfService nature() default NatureOfService.VIEW;     // <.>
-  @AliasFor(annotation = Named.class, attribute = "value")
+  @Deprecated(forRemoval = true, since = "2.0.0-RC1")
 String logicalTypeName() default "";     // <.>
 }
 ----
@@ -25,6 +25,13 @@ The nature of this service, either in the UI or REST only
 <.> xref:#logicalTypeName[logicalTypeName]
 +
 --
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use Spring semantics instead, eg. _Named_ or equivalent
+====
+
 The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.CustomerService_ for a class 'org.mycompany.services.CustomerService'
 --
 
@@ -38,9 +45,16 @@ The nature of this service, either in the UI or REST only
 [#logicalTypeName]
 === logicalTypeName
 
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use Spring semantics instead, eg. _Named_ or equivalent
+====
+
 The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.CustomerService_ for a class 'org.mycompany.services.CustomerService'
 
-This value, if specified, is used in the serialized form of the object's xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] . A xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is used by the framework to uniquely identify an object over time (same concept as a URN). Otherwise, if not specified, the fully qualified class name is used instead.
+This value, if specified, is used in the serialized form of the object's xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] . A xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is used by the framework to uniquely identify an object over time (same concept as a URN). Otherwise, if not specified, the default Spring Bean name is used instead.
 
 include::hooks/DomainService_010-examples-and-usage.adoc[]
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/MultivariateParameterSupport.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/MultivariateParameterSupport.adoc
new file mode 100644
index 0000000000..b0a0f1de79
--- /dev/null
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/MultivariateParameterSupport.adoc
@@ -0,0 +1,33 @@
+= @MultivariateParameterSupport
+: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 [...]
+
+[WARNING]
+====
+[red]#_deprecated:_#
+
+likely to be phased out with later releases, while there is yet no definitive schedule
+====
+
+Indicates that a method is supporting an _Action_ parameter, while allowing for one or more than one arguments to be passed in.
+
+Following method templates are supported to receive a xref:refguide:applib:index/annotation/MultivariateParameterSupport.adoc[MultivariateParameterSupport] annotation:
+
+* hideNXxx
+* disableNXxx
+* choicesNXxx
+* autoCompleteNXxx
+* validateNXxx
+
+By placing the xref:refguide:applib:index/annotation/MultivariateParameterSupport.adoc[MultivariateParameterSupport] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
+
+It was introduced to allow compatibility with the _Apache Isis v1_ programming model and is likely going to be phased out with later releases.
+
+== API
+
+[source,java]
+.MultivariateParameterSupport.java
+----
+@interface MultivariateParameterSupport {
+}
+----
+
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/exceprecog/RootCauseFinder.adoc
similarity index 80%
rename from antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/services/exceprecog/RootCauseFinder.adoc
index 22d30488d6..1dd58a305a 100644
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/exceprecog/RootCauseFinder.adoc
@@ -1,15 +1,16 @@
-= WithCodeGetter _(interface)_
+= RootCauseFinder _(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 [...]
 
-Indicates that the implementing class has a _#getCode() code_ .
+SPI to help _Exception_ root cause finding.
+
+Either returns a more specific _Throwable_ or an _Optional#empty()_ .
 
 == API
 
 [source,java]
-.WithCodeGetter.java
+.RootCauseFinder.java
 ----
-interface WithCodeGetter {
-  String getCode()
+interface RootCauseFinder {
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/BeanDescriptor.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/BeanDescriptor.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/BeanDescriptor.adoc
rename to antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/BeanDescriptor.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/ContextBeans.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/ContextBeans.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/ContextBeans.adoc
rename to antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/ContextBeans.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/SpringBeansService.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/SpringBeansService.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/service/SpringBeansService.adoc
rename to antora/components/refguide-index/modules/core/pages/index/runtimeservices/spring/SpringBeansService.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/CommandSubscriberForJdo.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/subscriber/CommandSubscriberForCommandLog.adoc
similarity index 88%
rename from antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/CommandSubscriberForJdo.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/subscriber/CommandSubscriberForCommandLog.adoc
index 597aba285b..e01cddf628 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/CommandSubscriberForJdo.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/subscriber/CommandSubscriberForCommandLog.adoc
@@ -1,12 +1,12 @@
-= CommandSubscriberForJdo
+= CommandSubscriberForCommandLog
 :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 [...]
 
 == API
 
 [source,java]
-.CommandSubscriberForJdo.java
+.CommandSubscriberForCommandLog.java
 ----
-class CommandSubscriberForJdo {
+class CommandSubscriberForCommandLog {
   void onCompleted(Command command)
 }
 ----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/ui/CommandLogServiceMenu.adoc
similarity index 78%
rename from antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/ui/CommandLogServiceMenu.adoc
index f47274b744..f391e12d30 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/applib/command/ui/CommandLogServiceMenu.adoc
@@ -1,20 +1,19 @@
-= CommandServiceMenu
+= CommandLogServiceMenu
 :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 [...]
 
 == API
 
 [source,java]
-.CommandServiceMenu.java
+.CommandLogServiceMenu.java
 ----
-class CommandServiceMenu {
-  public final static String LOGICAL_TYPE_NAME;
-  List<CommandJdo> activeCommands()
+class CommandLogServiceMenu {
+  List<? extends CommandLog> activeCommands()
   boolean hideActiveCommands()
-  List<CommandJdo> findCommands(LocalDate from, LocalDate to)
+  List<? extends CommandLog> findCommands(LocalDate from, LocalDate to)
   boolean hideFindCommands()
   LocalDate default0FindCommands()
   LocalDate default1FindCommands()
-  CommandJdo findCommandById(UUID transactionId)
+  CommandLog findCommandById(UUID transactionId)
   boolean hideFindCommandById()
   void truncateLog()
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
index f362f7e99b..9b2bff5b0c 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
@@ -1,6 +1,8 @@
 = IsisModuleExtCommandReplayPrimary
 :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 [...]
 
+Activates with _Spring profile_ 'command-replay-primary'.
+
 == API
 
 [source,java]
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.adoc
new file mode 100644
index 0000000000..3f1ca4493f
--- /dev/null
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.adoc
@@ -0,0 +1,26 @@
+= CommandRetrievalOnPrimaryService
+: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 [...]
+
+== API
+
+[source,java]
+.CommandRetrievalOnPrimaryService.java
+----
+class CommandRetrievalOnPrimaryService {
+  List<CommandDto> findCommandsOnPrimaryAsDto(UUID interactionId, Integer batchSize)     // <.>
+  Integer default1FindCommandsOnPrimaryAsDto()
+}
+----
+
+<.> xref:#findCommandsOnPrimaryAsDto__UUID_Integer[findCommandsOnPrimaryAsDto(UUID, Integer)]
++
+--
+TODO: outdated info ... These actions should be called with HTTP Accept Header set to: `application/xml;profile="urn:org.restfulobjects:repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"` 
+--
+
+== Members
+
+[#findCommandsOnPrimaryAsDto__UUID_Integer]
+=== findCommandsOnPrimaryAsDto(UUID, Integer)
+
+TODO: outdated info ... These actions should be called with HTTP Accept Header set to: `application/xml;profile="urn:org.restfulobjects:repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"` 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
deleted file mode 100644
index a7dbf43af6..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
+++ /dev/null
@@ -1,27 +0,0 @@
-= CommandRetrievalService
-: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 [...]
-
-== API
-
-[source,java]
-.CommandRetrievalService.java
-----
-class CommandRetrievalService {
-  public static final String LOGICAL_TYPE_NAME;
-  List<? extends CommandModel> findCommandsOnPrimaryFrom(UUID interactionId, Integer batchSize)     // <.>
-  Integer default1FindCommandsOnPrimaryFrom()
-}
-----
-
-<.> xref:#findCommandsOnPrimaryFrom__UUID_Integer[findCommandsOnPrimaryFrom(UUID, Integer)]
-+
---
-These actions should be called with HTTP Accept Header set to: `application/xml;profile="urn:org.restfulobjects:repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"` 
---
-
-== Members
-
-[#findCommandsOnPrimaryFrom__UUID_Integer]
-=== findCommandsOnPrimaryFrom(UUID, Integer)
-
-These actions should be called with HTTP Accept Header set to: `application/xml;profile="urn:org.restfulobjects:repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"` 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
index e04e99a7a6..86479bdd74 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
@@ -7,7 +7,6 @@
 .CommandReplayOnPrimaryService.java
 ----
 class CommandReplayOnPrimaryService {
-  public static final String LOGICAL_TYPE_NAME;
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
index 7e98aa2fec..87086cd5b5 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
@@ -1,6 +1,8 @@
 = IsisModuleExtCommandReplaySecondary
 :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 [...]
 
+Activates with _Spring profile_ 'command-replay-secondary'.
+
 == API
 
 [source,java]
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
index 1f1426085e..58a921b45c 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
@@ -7,13 +7,13 @@
 .CommandReplayAnalyser.java
 ----
 interface CommandReplayAnalyser {
-  String analyzeReplay(CommandModel commandJdo)     // <.>
+  String analyzeReplay(ICommandLog commandJdo)     // <.>
 }
 ----
 
-<.> xref:#analyzeReplay__CommandModel[analyzeReplay(CommandModel)]
+<.> xref:#analyzeReplay__ICommandLog[analyzeReplay(ICommandLog)]
 
 == Members
 
-[#analyzeReplay__CommandModel]
-=== analyzeReplay(CommandModel)
+[#analyzeReplay__ICommandLog]
+=== analyzeReplay(ICommandLog)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
index 46061501e4..5f83257a9d 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
@@ -8,7 +8,7 @@
 ----
 class CommandReplayAnalyserException {
   void init()
-  String analyzeReplay(CommandModel commandModel)
+  String analyzeReplay(ICommandLog commandLog)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
index 9f886a050f..6bbb475dba 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
@@ -8,7 +8,7 @@
 ----
 class CommandReplayAnalyserResult {
   void init()
-  String analyzeReplay(CommandModel commandModel)
+  String analyzeReplay(ICommandLog commandLog)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
index bee7a97267..9f378a8463 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
@@ -7,11 +7,11 @@
 .CommandReplayAnalysisService.java
 ----
 class CommandReplayAnalysisService {
-  void analyse(CommandModel commandModel)     // <.>
+  void analyse(ICommandLog commandLog)     // <.>
 }
 ----
 
-<.> xref:#analyse__CommandModel[analyse(CommandModel)]
+<.> xref:#analyse__ICommandLog[analyse(ICommandLog)]
 +
 --
 if hit an issue with the command having been replayed, then mark this as in error. This will effectively block the running of any further commands until the administrator fixes the issue.
@@ -19,7 +19,7 @@ if hit an issue with the command having been replayed, then mark this as in erro
 
 == Members
 
-[#analyse__CommandModel]
-=== analyse(CommandModel)
+[#analyse__ICommandLog]
+=== analyse(ICommandLog)
 
 if hit an issue with the command having been replayed, then mark this as in error. This will effectively block the running of any further commands until the administrator fixes the issue.
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc
index df1b8952e1..e8b023f1bf 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc
@@ -7,11 +7,13 @@
 .CommandFetcher.java
 ----
 class CommandFetcher {
-  List<CommandDto> fetchCommand(CommandModel previousHwmIfAny)     // <.>
+  CommandFetcher(SecondaryConfig secondaryConfig)
+  Can<CommandDto> fetchCommand(ICommandLog previousHwmIfAny)     // <.>
+  Can<CommandDto> callPrimary(UUID interactionId)
 }
 ----
 
-<.> xref:#fetchCommand__CommandModel[fetchCommand(CommandModel)]
+<.> xref:#fetchCommand__ICommandLog[fetchCommand(ICommandLog)]
 +
 --
 Replicates a single command.
@@ -19,7 +21,7 @@ Replicates a single command.
 
 == Members
 
-[#fetchCommand__CommandModel]
-=== fetchCommand(CommandModel)
+[#fetchCommand__ICommandLog]
+=== fetchCommand(ICommandLog)
 
 Replicates a single command.
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandModel_exclude.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_exclude.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandModel_exclude.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_exclude.adoc
index 9742e52380..da93288be1 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandModel_exclude.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_exclude.adoc
@@ -1,13 +1,13 @@
-= CommandModel_exclude
+= CommandLog_exclude
 :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 [...]
 
 == API
 
 [source,java]
-.CommandModel_exclude.java
+.CommandLog_exclude.java
 ----
-class CommandModel_exclude {
-  CommandModel act()
+class CommandLog_exclude {
+  CommandLog act()
   boolean hideAct()
   String disableAct()
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_replayQueue.adoc
similarity index 86%
rename from antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_replayQueue.adoc
index 822489a0c2..4234051da7 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandLog_replayQueue.adoc
@@ -1,13 +1,13 @@
-= CommandJdo_replayQueue
+= CommandLog_replayQueue
 :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 [...]
 
 == API
 
 [source,java]
-.CommandJdo_replayQueue.java
+.CommandLog_replayQueue.java
 ----
-class CommandJdo_replayQueue {
-  List<? extends CommandModel> coll()
+class CommandLog_replayQueue {
+  List<CommandLog> coll()
   boolean hideColl()
 }
 ----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/SecondaryStatus.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/status/SecondaryStatus.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/SecondaryStatus.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/status/SecondaryStatus.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
index c16c6a1a0e..3aeccd9cd0 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
@@ -7,7 +7,6 @@
 .CommandReplayOnSecondaryService.java
 ----
 class CommandReplayOnSecondaryService {
-  public static final String LOGICAL_TYPE_NAME;
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/IsisModuleExtExcelApplib.adoc
similarity index 88%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/IsisModuleExtExcelApplib.adoc
index 0fa19781a5..0769569c3b 100644
--- a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/IsisModuleExtExcelApplib.adoc
@@ -1,12 +1,12 @@
-= IsisModuleSubdomainsExcelApplib
+= IsisModuleExtExcelApplib
 :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 [...]
 
 == API
 
 [source,java]
-.IsisModuleSubdomainsExcelApplib.java
+.IsisModuleExtExcelApplib.java
 ----
-class IsisModuleSubdomainsExcelApplib {
+class IsisModuleExtExcelApplib {
   public static final String NAMESPACE;
 }
 ----
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/AggregationType.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/AggregationType.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/AggregationType.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/AggregationType.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/ExcelService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/ExcelService.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/ExcelService.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/ExcelService.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/HyperLink.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/HyperLink.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/HyperLink.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/HyperLink.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotColumn.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotColumn.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotColumn.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotColumn.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotDecoration.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotDecoration.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotDecoration.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotDecoration.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotRow.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotRow.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotRow.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotRow.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotValue.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotValue.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/PivotValue.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/PivotValue.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/RowHandler.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/RowHandler.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/RowHandler.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/RowHandler.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/WorksheetContent.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/WorksheetContent.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/WorksheetContent.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/WorksheetContent.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/WorksheetSpec.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/WorksheetSpec.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/dom/WorksheetSpec.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/dom/WorksheetSpec.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/AnnotationList.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/AnnotationList.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/AnnotationList.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/AnnotationList.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/AnnotationTriplet.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/AnnotationTriplet.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/AnnotationTriplet.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/AnnotationTriplet.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/ExcelFileBlobConverter.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/ExcelFileBlobConverter.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/ExcelFileBlobConverter.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/ExcelFileBlobConverter.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/Mode.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/Mode.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/Mode.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/Mode.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/PivotUtils.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/PivotUtils.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/PivotUtils.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/PivotUtils.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/SheetPivoter.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/SheetPivoter.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/applib/util/SheetPivoter.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/applib/util/SheetPivoter.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixture.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixture.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixture2.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixture2.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixtureRowHandler.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixtureRowHandler.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixtureRowHandler.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixtureRowHandler.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/FixtureAwareRowHandler.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/FixtureAwareRowHandler.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/FixtureAwareRowHandler.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/FixtureAwareRowHandler.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/IsisModuleExtExcelTesting.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/excel/testing/IsisModuleExtExcelTesting.adoc
index b9dc08055b..6204d8872d 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/excel/testing/IsisModuleExtExcelTesting.adoc
@@ -1,12 +1,12 @@
-= IsisModuleExtRestClient
+= IsisModuleExtExcelTesting
 :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 [...]
 
 == API
 
 [source,java]
-.IsisModuleExtRestClient.java
+.IsisModuleExtExcelTesting.java
 ----
-class IsisModuleExtRestClient {
+class IsisModuleExtExcelTesting {
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc b/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
index da5aca6c05..5102df08a2 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
@@ -7,7 +7,6 @@
 .HsqlDbManagerMenu.java
 ----
 class HsqlDbManagerMenu {
-  public final static String LOGICAL_TYPE_NAME;
   HsqlDbManagerMenu(DataSourceIntrospectionService datasourceIntrospector)
   void hsqlDbManager()
   boolean hideHsqlDbManager()
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc b/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
deleted file mode 100644
index 28bd687c3a..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= IsisModuleExtJaxRsClientApplib
-: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 [...]
-
-== API
-
-[source,java]
-.IsisModuleExtJaxRsClientApplib.java
-----
-class IsisModuleExtJaxRsClientApplib {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc b/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc
deleted file mode 100644
index 1afb8b5cc7..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= JaxRsClient _(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 [...]
-
-== API
-
-[source,java]
-.JaxRsClient.java
-----
-interface JaxRsClient {
-  JaxRsResponse get(URI uri, Class<?> dtoClass, ReprType reprType, String username, String password)
-  JaxRsResponse post(URI uri, String bodyJson, String username, String password)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc b/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc
deleted file mode 100644
index 72e281c542..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= JaxRsResponse _(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 [...]
-
-== API
-
-[source,java]
-.JaxRsResponse.java
-----
-interface JaxRsResponse {
-  int getStatus()
-  T readEntity(Class<T> entityType)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/ResponseDigest.adoc b/antora/components/refguide-index/modules/extensions/pages/index/restclient/ResponseDigest.adoc
deleted file mode 100644
index 720eb93451..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/restclient/ResponseDigest.adoc
+++ /dev/null
@@ -1,82 +0,0 @@
-= ResponseDigest
-: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 [...]
-
-== API
-
-[source,java]
-.ResponseDigest.java
-----
-class ResponseDigest<T> {
-  ResponseDigest<T> of(Response response, Class<T> entityType)     // <.>
-  ResponseDigest<T> ofList(Response response, Class<T> entityType, GenericType<List<T>> genericType)     // <.>
-  ResponseDigest<T> ofAsyncFailure(Future<Response> asyncResponse, Class<T> entityType, Exception failure)     // <.>
-  boolean isSuccess()     // <.>
-  boolean isFailure()     // <.>
-  Optional<T> getEntity()     // <.>
-  Can<T> getEntities()     // <.>
-  Exception getFailureCause()     // <.>
-  T singletonOrElseMapFailure(Function<Exception, T> failureMapper)     // <.>
-  Can<T> multipleOrElseMapFailure(Function<Exception, Can<T>> failureMapper)     // <.>
-}
-----
-
-<.> xref:#of__Response_Class[of(Response, Class)]
-+
---
-synchronous response processing (single entity)
---
-<.> xref:#ofList__Response_Class_GenericType[ofList(Response, Class, GenericType)]
-+
---
-synchronous response processing (list of entities)
---
-<.> xref:#ofAsyncFailure__Future_Class_Exception[ofAsyncFailure(Future, Class, Exception)]
-+
---
-a-synchronous response failure processing
---
-<.> xref:#isSuccess__[isSuccess()]
-<.> xref:#isFailure__[isFailure()]
-<.> xref:#getEntity__[getEntity()]
-<.> xref:#getEntities__[getEntities()]
-<.> xref:#getFailureCause__[getFailureCause()]
-<.> xref:#singletonOrElseMapFailure__Function[singletonOrElseMapFailure(Function)]
-<.> xref:#multipleOrElseMapFailure__Function[multipleOrElseMapFailure(Function)]
-
-== Members
-
-[#of__Response_Class]
-=== of(Response, Class)
-
-synchronous response processing (single entity)
-
-[#ofList__Response_Class_GenericType]
-=== ofList(Response, Class, GenericType)
-
-synchronous response processing (list of entities)
-
-[#ofAsyncFailure__Future_Class_Exception]
-=== ofAsyncFailure(Future, Class, Exception)
-
-a-synchronous response failure processing
-
-[#isSuccess__]
-=== isSuccess()
-
-[#isFailure__]
-=== isFailure()
-
-[#getEntity__]
-=== getEntity()
-
-[#getEntities__]
-=== getEntities()
-
-[#getFailureCause__]
-=== getFailureCause()
-
-[#singletonOrElseMapFailure__Function]
-=== singletonOrElseMapFailure(Function)
-
-[#multipleOrElseMapFailure__Function]
-=== multipleOrElseMapFailure(Function)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientException.adoc b/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientException.adoc
deleted file mode 100644
index 43c0c81d8d..0000000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientException.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-= RestfulClientException
-: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 [...]
-
-== API
-
-[source,java]
-.RestfulClientException.java
-----
-class RestfulClientException {
-  RestfulClientException()
-  RestfulClientException(String message)
-  RestfulClientException(Throwable cause)
-  RestfulClientException(String message, Throwable cause)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/LogicalTypeName.adoc b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/LogicalTypeName.adoc
index d4f2ae8a65..ba6eeccb0f 100644
--- a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/LogicalTypeName.adoc
+++ b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/LogicalTypeName.adoc
@@ -1,7 +1,7 @@
 = @LogicalTypeName
 :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 [...]
 
-Meta-annotation for a mandatory _String_ property or parameter representing a logical type name of a domain object (as per @ _DomainObject#logicalTypeName() DomainObject#logicalTypeName_ or @ _DomainService#logicalTypeName() DomainObject#logicalTypeName_ ).
+Meta-annotation for a mandatory _String_ property or parameter representing a logical type name of a domain object (as per @ _DomainObject#logicalTypeName()_ or @ _Named#value()_ ) and consorts.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/ObjectIdentifier.adoc b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/ObjectIdentifier.adoc
index 5c575195c7..77c6ef700f 100644
--- a/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/ObjectIdentifier.adoc
+++ b/antora/components/refguide-index/modules/persistence/pages/index/jdo/applib/types/ObjectIdentifier.adoc
@@ -1,7 +1,7 @@
 = @ObjectIdentifier
 :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 [...]
 
-Meta-annotation for a mandatory _String_ property or parameter representing a the identity of a domain object (with respect to its logical type, as per @ _DomainObject#logicalTypeName() DomainObject#logicalTypeName_ or @ _DomainService#logicalTypeName() DomainObject#logicalTypeName_ ).
+Meta-annotation for a mandatory _String_ property or parameter representing a the identity of a domain object (with respect to its logical type, as per @ _DomainObject#logicalTypeName()_ or @ _Named#value()_ ) and consorts.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Chained.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Chained.adoc
deleted file mode 100644
index 2fcc367496..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Chained.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-= Chained _(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 [...]
-
-== API
-
-[source,java]
-.Chained.java
-----
-interface Chained<T> {
-  T getPrevious()     // <.>
-  T getNext()     // <.>
-}
-----
-
-<.> xref:#getPrevious__[getPrevious()]
-+
---
-The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
---
-<.> xref:#getNext__[getNext()]
-+
---
-The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
---
-
-== Members
-
-[#getPrevious__]
-=== getPrevious()
-
-The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
-
-Implementations where successive intervals are contiguous should instead implement xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
-
-[#getNext__]
-=== getNext()
-
-The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
-
-Implementations where successive intervals are contiguous should instead implement xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Dflt.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Dflt.adoc
deleted file mode 100644
index b5147eed63..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Dflt.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= Dflt
-: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 [...]
-
-== API
-
-[source,java]
-.Dflt.java
-----
-class Dflt {
-  T of(Collection<T> choices)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc
deleted file mode 100644
index 89b816f496..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= IsisModuleSubdomainsBaseApplib
-: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 [...]
-
-== API
-
-[source,java]
-.IsisModuleSubdomainsBaseApplib.java
-----
-class IsisModuleSubdomainsBaseApplib {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/PowerType.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/PowerType.adoc
deleted file mode 100644
index f896cdbe3b..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/PowerType.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= PowerType _(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 [...]
-
-For `enum` s that act as powertypes, in other words acting as a factory for subtypes of some inheritance hierarchy.
-
-== API
-
-[source,java]
-.PowerType.java
-----
-interface PowerType<T> {
-  T create(FactoryService factoryService)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Titled.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Titled.adoc
deleted file mode 100644
index 554e808baf..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/Titled.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= Titled _(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 [...]
-
-== API
-
-[source,java]
-.Titled.java
-----
-interface Titled {
-  String title()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/TitledEnum.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
deleted file mode 100644
index bed2d2e36e..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= TitledEnum _(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 [...]
-
-An enum that implements xref:refguide:subdomains:index/base/applib/Titled.adoc[Titled] and moreover its _#title()_ is derived according to the _StringUtils#enumTitle(String)_ algorithm.
-
-== API
-
-[source,java]
-.TitledEnum.java
-----
-interface TitledEnum {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc
deleted file mode 100644
index a1a68749a7..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= BaseServicesModule
-: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 [...]
-
-== API
-
-[source,java]
-.BaseServicesModule.java
-----
-class BaseServicesModule {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc
deleted file mode 100644
index 76b3a067e1..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc
+++ /dev/null
@@ -1,49 +0,0 @@
-= CalendarService _(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 [...]
-
-== API
-
-[source,java]
-.CalendarService.java
-----
-interface CalendarService {
-  LocalDate beginningOfMonth()     // <.>
-  LocalDate beginningOfMonth(LocalDate date)
-  LocalDate beginningOfQuarter()     // <.>
-  LocalDate beginningOfNextQuarter()     // <.>
-  LocalDate beginningOfQuarter(LocalDate date)
-}
-----
-
-<.> xref:#beginningOfMonth__[beginningOfMonth()]
-+
---
-Returns the date corresponding to the beginning of the current month.
---
-<.> xref:#beginningOfQuarter__[beginningOfQuarter()]
-+
---
-Returns the date corresponding to the beginning of the current quarter (typically: January, April, July or October).
---
-<.> xref:#beginningOfNextQuarter__[beginningOfNextQuarter()]
-+
---
-Returns the date corresponding to the beginning of the quarter following this one.
---
-
-== Members
-
-[#beginningOfMonth__]
-=== beginningOfMonth()
-
-Returns the date corresponding to the beginning of the current month.
-
-[#beginningOfQuarter__]
-=== beginningOfQuarter()
-
-Returns the date corresponding to the beginning of the current quarter (typically: January, April, July or October).
-
-[#beginningOfNextQuarter__]
-=== beginningOfNextQuarter()
-
-Returns the date corresponding to the beginning of the quarter following this one.
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/AddressLine.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/AddressLine.adoc
deleted file mode 100644
index e55b2e9c91..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/AddressLine.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @AddressLine
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a line of an address.
-
-== API
-
-[source,java]
-.AddressLine.java
-----
-@interface AddressLine {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Description.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Description.adoc
deleted file mode 100644
index e49e0013c5..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Description.adoc
+++ /dev/null
@@ -1,28 +0,0 @@
-= @Description
-: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 [...]
-
-Meta-annotation for an optional _String_ property or parameter representing a description of some sort.
-
-== API
-
-[source,java]
-.Description.java
-----
-@interface Description {
-  int MAX_LENGTH;
-  int MULTI_LINE;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = PropertyLayout.class, attribute = "multiLine")
-int propertyLayoutMultiLine() default MULTI_LINE;
-  @AliasFor(annotation = ParameterLayout.class, attribute = "multiLine")
-int parameterLayoutMultiLine() default MULTI_LINE;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Email.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Email.adoc
deleted file mode 100644
index 84ed1beae5..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Email.adoc
+++ /dev/null
@@ -1,55 +0,0 @@
-= @Email
-: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 [...]
-
-Meta-annotation for an optional _String_ property or parameter representing an email address.
-
-== API
-
-[source,java]
-.Email.java
-----
-@interface Email {
-  int MAX_LENGTH;     // <.>
-  String REGEX_PATTERN;     // <.>
-  String REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Property.class, attribute = "regexPattern")
-String propertyRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPattern")
-String parameterRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Property.class, attribute = "regexPatternReplacement")
-String propertyRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPatternReplacement")
-String parameterRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-}
-----
-
-<.> xref:#MAX_LENGTH[MAX_LENGTH]
-+
---
-Seemaximum length of an email address.
---
-<.> xref:#REGEX_PATTERN[REGEX_PATTERN]
-+
---
-as per http://emailregex.com/
---
-
-== Members
-
-[#MAX_LENGTH]
-=== MAX_LENGTH
-
-Seemaximum length of an email address.
-
-[#REGEX_PATTERN]
-=== REGEX_PATTERN
-
-as per http://emailregex.com/
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Fqcn.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Fqcn.adoc
deleted file mode 100644
index caf5ebdfef..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Fqcn.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @Fqcn
-: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 [...]
-
-Meta-annotation for a _String_ property or parameter representing a fully qualified class name
-
-== API
-
-[source,java]
-.Fqcn.java
-----
-@interface Fqcn {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/LogicalTypeName.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/LogicalTypeName.adoc
deleted file mode 100644
index 1e01c36c71..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/LogicalTypeName.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @LogicalTypeName
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a logical type name of a domain object (as per @ _DomainObject#logicalTypeName() DomainObject#logicalTypeName_ or @ _DomainService#logicalTypeName() DomainObject#logicalTypeName_ ).
-
-== API
-
-[source,java]
-.LogicalTypeName.java
-----
-@interface LogicalTypeName {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Money.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Money.adoc
deleted file mode 100644
index 027b98363b..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Money.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= @Money
-: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 [...]
-
-Meta-annotation for an optional _java.math.BigDecimal_ property or parameter representing a monetary amount.
-
-== API
-
-[source,java]
-.Money.java
-----
-@interface Money {
-  int INTEGER;
-  int FRACTION;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = javax.validation.constraints.Digits.class, attribute = "integer")
-int digitsInteger() default Money.INTEGER;
-  @AliasFor(annotation = javax.validation.constraints.Digits.class, attribute = "fraction")
-int digitsFraction() default Money.FRACTION;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Name.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Name.adoc
deleted file mode 100644
index 2bc5e57ce9..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Name.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @Name
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a name of some sort.
-
-== API
-
-[source,java]
-.Name.java
-----
-@interface Name {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Notes.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Notes.adoc
deleted file mode 100644
index 2135c549db..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Notes.adoc
+++ /dev/null
@@ -1,28 +0,0 @@
-= @Notes
-: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 [...]
-
-Meta-annotation for an optional _String_ property or parameter representing a notes or comments about some object.
-
-== API
-
-[source,java]
-.Notes.java
-----
-@interface Notes {
-  int MAX_LENGTH;
-  int MULTI_LINE;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = PropertyLayout.class, attribute = "multiLine")
-int propertyLayoutMultiLine() default MULTI_LINE;
-  @AliasFor(annotation = ParameterLayout.class, attribute = "multiLine")
-int parameterLayoutMultiLine() default MULTI_LINE;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ObjectIdentifier.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ObjectIdentifier.adoc
deleted file mode 100644
index 6f000bd16b..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ObjectIdentifier.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @ObjectIdentifier
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a the identity of a domain object (with respect to its logical type, as per @ _DomainObject#logicalTypeName() DomainObject#logicalTypeName_ or @ _DomainService#logicalTypeName() DomainObject#logicalTypeName_ ).
-
-== API
-
-[source,java]
-.ObjectIdentifier.java
-----
-@interface ObjectIdentifier {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Percentage.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Percentage.adoc
deleted file mode 100644
index 681229677f..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Percentage.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= @Percentage
-: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 [...]
-
-Meta-annotation for an optional _java.math.BigDecimal_ property or parameter representing a percentage amount.
-
-== API
-
-[source,java]
-.Percentage.java
-----
-@interface Percentage {
-  int INTEGER;
-  int FRACTION;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = javax.validation.constraints.Digits.class, attribute = "integer")
-int digitsInteger() default Money.INTEGER;
-  @AliasFor(annotation = javax.validation.constraints.Digits.class, attribute = "fraction")
-int digitsFraction() default Money.FRACTION;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PhoneNumber.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PhoneNumber.adoc
deleted file mode 100644
index b9189848fa..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PhoneNumber.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= @PhoneNumber
-: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 [...]
-
-Meta-annotation for an optional _String_ property or parameter representing a phone number.
-
-== API
-
-[source,java]
-.PhoneNumber.java
-----
-@interface PhoneNumber {
-  int MAX_LENGTH;
-  String REGEX_PATTERN;
-  String REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Property.class, attribute = "regexPattern")
-String propertyRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPattern")
-String parameterRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Property.class, attribute = "regexPatternReplacement")
-String propertyRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPatternReplacement")
-String parameterRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PostalCode.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PostalCode.adoc
deleted file mode 100644
index a5ece97878..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/PostalCode.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @PostalCode
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a postal code or zip code.
-
-== API
-
-[source,java]
-.PostalCode.java
-----
-@interface PostalCode {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ProperName.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ProperName.adoc
deleted file mode 100644
index 47df76726a..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/ProperName.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @ProperName
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing the "proper" (or formal) name of some sort.
-
-== API
-
-[source,java]
-.ProperName.java
-----
-@interface ProperName {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Reference.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Reference.adoc
deleted file mode 100644
index 0381c69760..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Reference.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= @Reference
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing A unique reference code of some sort, restricted to capitals, numbers and '_', '/' and '-'.
-
-== API
-
-[source,java]
-.Reference.java
-----
-@interface Reference {
-  int MAX_LENGTH;
-  String REGEX_PATTERN;
-  String REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.OPTIONAL;
-  @AliasFor(annotation = Property.class, attribute = "regexPattern")
-String propertyRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPattern")
-String parameterRegexPattern() default REGEX_PATTERN;
-  @AliasFor(annotation = Property.class, attribute = "regexPatternReplacement")
-String propertyRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-  @AliasFor(annotation = Parameter.class, attribute = "regexPatternReplacement")
-String parameterRegexPatternReplacement() default REGEX_PATTERN_REPLACEMENT;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Title.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Title.adoc
deleted file mode 100644
index 7ade8bb8ff..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Title.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @Title
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a title (or perhaps label) of some sort.
-
-== API
-
-[source,java]
-.Title.java
-----
-@interface Title {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UrlTemplate.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UrlTemplate.adoc
deleted file mode 100644
index 59aaa4c7f5..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/UrlTemplate.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @UrlTemplate
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing a URL template, for example for an entity that holds configuration data to access external systems.
-
-== API
-
-[source,java]
-.UrlTemplate.java
-----
-@interface UrlTemplate {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Username.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Username.adoc
deleted file mode 100644
index 2bb4f43eaa..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/types/Username.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= @Username
-: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 [...]
-
-Meta-annotation for a mandatory _String_ property or parameter representing the unique username (or login name) of a user of the system.
-
-== API
-
-[source,java]
-.Username.java
-----
-@interface Username {
-  int MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "maxLength")
-int propertyMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Parameter.class, attribute = "maxLength")
-int parameterMaxLength() default MAX_LENGTH;
-  @AliasFor(annotation = Property.class, attribute = "optionality")
-Optionality propertyOptionality() default Optionality.MANDATORY;
-  @AliasFor(annotation = Parameter.class, attribute = "optionality")
-Optionality parameterOptionality() default Optionality.MANDATORY;
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc
deleted file mode 100644
index 73b6885baf..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= ClassUtils
-: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 [...]
-
-== API
-
-[source,java]
-.ClassUtils.java
-----
-class ClassUtils {
-  Class<? extends T> load(String clsName, Class<T> cls)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc
deleted file mode 100644
index 1ea6cb7ac0..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-= JodaPeriodUtils
-: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 [...]
-
-Utilities for manipulating parsing JODA _Period_ s.
-
-== API
-
-[source,java]
-.JodaPeriodUtils.java
-----
-class JodaPeriodUtils {
-  Period asPeriod(String inputStr)
-  String asString(Period period)
-  String asSimpleString(Period period)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc
deleted file mode 100644
index 16a05c039f..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-= MathUtils
-: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 [...]
-
-General-purpose math utilities.
-
-== API
-
-[source,java]
-.MathUtils.java
-----
-class MathUtils {
-  BigDecimal round(BigDecimal input, int precision)
-  boolean isZeroOrNull(BigDecimal input)
-  boolean isNotZeroOrNull(BigDecimal input)
-  BigDecimal firstNonZero(BigDecimal... values)
-  BigDecimal max(BigDecimal... input)
-  BigDecimal maxUsingFirstSignum(BigDecimal... values)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc
deleted file mode 100644
index c7bc6fe822..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= MessageUtils
-: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 [...]
-
-== API
-
-[source,java]
-.MessageUtils.java
-----
-class MessageUtils {
-  String normalize(Exception ex)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc
deleted file mode 100644
index bb42a37391..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-= StringUtils
-: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 [...]
-
-== API
-
-[source,java]
-.StringUtils.java
-----
-class StringUtils {
-  String enumTitle(String string)
-  String enumDeTitle(String string)
-  String wildcardToCaseInsensitiveRegex(String pattern)
-  String wildcardToRegex(String pattern)
-  String capitalize(String str)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
deleted file mode 100644
index 15c9d51dd7..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-= TitleBuilder
-: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 [...]
-
-== API
-
-[source,java]
-.TitleBuilder.java
-----
-class TitleBuilder {
-  public static final Class[] NO_PARAMETER_TYPES;
-  public static final Object[] NO_ARGUMENTS;
-  TitleBuilder start()
-  TitleBuilder withParent(Object object)
-  TitleBuilder withName(String name)
-  TitleBuilder withReference(String reference)
-  String toString()
-  TitleBuilder withName(Object object)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc
deleted file mode 100644
index df81e5bbc5..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc
+++ /dev/null
@@ -1,93 +0,0 @@
-= AbstractInterval
-: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 [...]
-
-== API
-
-[source,java]
-.AbstractInterval.java
-----
-class AbstractInterval<T> {
-  AbstractInterval()
-  AbstractInterval(Interval interval)
-  AbstractInterval(LocalDate startDate, LocalDate endDate)
-  AbstractInterval(LocalDate startDate, LocalDate endDate, IntervalEnding ending)
-  Interval asInterval()
-  boolean contains(LocalDate date)     // <.>
-  boolean contains(T localDateInterval)     // <.>
-  int days()     // <.>
-  LocalDate endDate()
-  LocalDate endDate(IntervalEnding ending)
-  LocalDate endDateExcluding()
-  LocalDate endDateFromStartDate()
-  boolean isValid()
-  T overlap(T otherInterval)     // <.>
-  boolean overlaps(T interval)     // <.>
-  LocalDate startDate()
-  boolean within(T interval)     // <.>
-  boolean isInfinite()
-  boolean isOpenEnded()
-}
-----
-
-<.> xref:#contains__LocalDate[contains(LocalDate)]
-+
---
-Does this date contain the specified time interval.
---
-<.> xref:#contains__T[contains(T)]
-+
---
-Does this time interval contain the specified time interval.
---
-<.> xref:#days__[days()]
-+
---
-The duration in days
---
-<.> xref:#overlap__T[overlap(T)]
-+
---
-Gets the overlap between this interval and another interval.
---
-<.> xref:#overlaps__T[overlaps(T)]
-+
---
-Does this time interval contain the specified time interval.
---
-<.> xref:#within__T[within(T)]
-+
---
-Does this interval is within the specified interval
---
-
-== Members
-
-[#contains__LocalDate]
-=== contains(LocalDate)
-
-Does this date contain the specified time interval.
-
-[#contains__T]
-=== contains(T)
-
-Does this time interval contain the specified time interval.
-
-[#days__]
-=== days()
-
-The duration in days
-
-[#overlap__T]
-=== overlap(T)
-
-Gets the overlap between this interval and another interval.
-
-[#overlaps__T]
-=== overlaps(T)
-
-Does this time interval contain the specified time interval.
-
-[#within__T]
-=== within(T)
-
-Does this interval is within the specified interval
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc
deleted file mode 100644
index 7fd437730e..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc
+++ /dev/null
@@ -1,46 +0,0 @@
-= LocalDateInterval
-: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 [...]
-
-== API
-
-[source,java]
-.LocalDateInterval.java
-----
-class LocalDateInterval {
-  LocalDateInterval()
-  LocalDateInterval(Interval interval)
-  LocalDateInterval(LocalDate startDate, LocalDate endDate)
-  LocalDateInterval(LocalDate startDate, LocalDate endDate, IntervalEnding ending)
-  LocalDateInterval excluding(LocalDate startDate, LocalDate endDate)
-  LocalDateInterval including(LocalDate startDate, LocalDate endDate)
-  boolean equals(Object obj)
-  int hashCode()
-  String toString()
-  String toString(String format)
-  LocalDateInterval parseString(String input)     // <.>
-  LocalDate endDateFromStartDate(LocalDate date)     // <.>
-}
-----
-
-<.> xref:#parseString__String[parseString(String)]
-+
---
-Parse a string representation of a LocalDateInterval Since this method is only used for testing it's not heavily guarded against illegal arguments
---
-<.> xref:#endDateFromStartDate__LocalDate[endDateFromStartDate(LocalDate)]
-+
---
-Returns an end date given the start date of the next adjoining interval
---
-
-== Members
-
-[#parseString__String]
-=== parseString(String)
-
-Parse a string representation of a LocalDateInterval Since this method is only used for testing it's not heavily guarded against illegal arguments
-
-[#endDateFromStartDate__LocalDate]
-=== endDateFromStartDate(LocalDate)
-
-Returns an end date given the start date of the next adjoining interval
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc
deleted file mode 100644
index ca327a3240..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc
+++ /dev/null
@@ -1,50 +0,0 @@
-= VT
-: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 [...]
-
-Factory methods for value types
-
-== API
-
-[source,java]
-.VT.java
-----
-class VT {
-  LocalDateInterval ldi(String intervalStr)
-  LocalDateInterval ldi(LocalDate st, LocalDate endDate, AbstractInterval.IntervalEnding intervalEnding)
-  LocalDateInterval ldix(LocalDate st, LocalDate endDate)
-  LocalDate ld(String dateStr)     // <.>
-  LocalDate ld(int yyyy, int mm, int dd)
-  BigInteger bi(int val)
-  BigInteger bi(Integer val)
-  BigDecimal bd(String str)
-  BigDecimal bd(double val)
-  BigDecimal bd(double v, int scale)
-  BigDecimal bd(double v, int scale, RoundingMode roundingMode)
-  BigDecimal bd2(double v)
-  BigDecimal bd2hup(double v)
-  BigDecimal bd4(double v)
-  BigDecimal bd(Double val)
-  BigDecimal bd(Double val, int scale)
-  BigDecimal bd(Double val, int scale, RoundingMode roundingMode)
-  BigDecimal bd2(Double val)
-  BigDecimal bd2hup(Double val)
-  BigDecimal bd4(Double val)
-  BigDecimal bd(int val)
-  BigDecimal bd(int val, int newScale)
-  BigDecimal bd1(int val)
-  BigDecimal bd2(int val)
-  BigDecimal bd4(int val)
-  BigDecimal bd(Integer val)
-  BigDecimal bd(Integer val, int newScale)
-  BigDecimal bd1(Integer val)
-  BigDecimal bd2(Integer val)
-  BigDecimal bd4(Integer val)
-}
-----
-
-<.> xref:#ld__String[ld(String)]
-
-== Members
-
-[#ld__String]
-=== ld(String)
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc
deleted file mode 100644
index 5f97f4b140..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= WithCodeComparable _(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 [...]
-
-== API
-
-[source,java]
-.WithCodeComparable.java
-----
-interface WithCodeComparable<T> {
-  void setCode(String code)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc
deleted file mode 100644
index dd44006432..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= WithCodeUnique _(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 [...]
-
-== API
-
-[source,java]
-.WithCodeUnique.java
-----
-interface WithCodeUnique {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc
deleted file mode 100644
index 30ede50fcb..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= WithDescriptionComparable _(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 [...]
-
-== API
-
-[source,java]
-.WithDescriptionComparable.java
-----
-interface WithDescriptionComparable<T> {
-  void setDescription(String description)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc
deleted file mode 100644
index c715b0bac0..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= WithDescriptionGetter _(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 [...]
-
-Indicates that the implementing class has a _#getDescription() description_ .
-
-== API
-
-[source,java]
-.WithDescriptionGetter.java
-----
-interface WithDescriptionGetter {
-  String getDescription()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc
deleted file mode 100644
index c32ed1197d..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= WithDescriptionUnique _(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 [...]
-
-== API
-
-[source,java]
-.WithDescriptionUnique.java
-----
-interface WithDescriptionUnique {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc
deleted file mode 100644
index 8fd4a6bcea..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-= WithInterval _(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 [...]
-
-== API
-
-[source,java]
-.WithInterval.java
-----
-interface WithInterval<T> {
-  LocalDate getStartDate()     // <.>
-  void setStartDate(LocalDate startDate)
-  LocalDate getEndDate()     // <.>
-  void setEndDate(LocalDate endDate)
-  LocalDateInterval getInterval()
-  LocalDateInterval getEffectiveInterval()
-  boolean isCurrent()
-}
-----
-
-<.> xref:#getStartDate__[getStartDate()]
-+
---
-The start date of the interval.
---
-<.> xref:#getEndDate__[getEndDate()]
-+
---
-The end date of the interval.
---
-
-== Members
-
-[#getStartDate__]
-=== getStartDate()
-
-The start date of the interval.
-
-A value of `null` implies that the parent's start date should be used. If that is `null` , then implies 'the beginning of time'.
-
-[#getEndDate__]
-=== getEndDate()
-
-The end date of the interval.
-
-A value of `null` implies that the parent's end date should be used. If that is `null` , then implies 'the end of time'.
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
deleted file mode 100644
index 0d2ac0920c..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
+++ /dev/null
@@ -1,57 +0,0 @@
-= WithIntervalContiguous _(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 [...]
-
-== API
-
-[source,java]
-.WithIntervalContiguous.java
-----
-interface WithIntervalContiguous<T> {
-  T getPredecessor()     // <.>
-  T getSuccessor()     // <.>
-  SortedSet<T> getTimeline()     // <.>
-}
-----
-
-<.> xref:#getPredecessor__[getPredecessor()]
-+
---
-The interval that immediately precedes this one, if any.
---
-<.> xref:#getSuccessor__[getSuccessor()]
-+
---
-The interval that immediately succeeds this one, if any.
---
-<.> xref:#getTimeline__[getTimeline()]
-+
---
-Show this xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
---
-
-== Members
-
-[#getPredecessor__]
-=== getPredecessor()
-
-The interval that immediately precedes this one, if any.
-
-The predecessor's _#getEndDate() end date_ is the day before this interval's _#getStartDate() start date_ .
-
-Implementations where successive intervals are NOT contiguous should instead implement xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained] .
-
-[#getSuccessor__]
-=== getSuccessor()
-
-The interval that immediately succeeds this one, if any.
-
-The successor's _#getStartDate() start date_ is the day after this interval's _#getEndDate() end date_ .
-
-Implementations where successive intervals are NOT contiguous should instead implement xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained] .
-
-[#getTimeline__]
-=== getTimeline()
-
-Show this xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
-
-This will typically (always) be a derived collection obtained by filtering a collection of the "parent".
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc
deleted file mode 100644
index 047b64ccd1..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-= WithIntervalMutable _(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 [...]
-
-== API
-
-[source,java]
-.WithIntervalMutable.java
-----
-interface WithIntervalMutable<T> {
-  T changeDates(LocalDate startDate, LocalDate endDate)
-  LocalDate default0ChangeDates()
-  LocalDate default1ChangeDates()
-  String validateChangeDates(LocalDate startDate, LocalDate endDate)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc
deleted file mode 100644
index 8fc09cc180..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= WithNameComparable _(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 [...]
-
-== API
-
-[source,java]
-.WithNameComparable.java
-----
-interface WithNameComparable<T> {
-  void setName(String name)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc
deleted file mode 100644
index 60f3d9cc01..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= WithNameGetter _(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 [...]
-
-Indicates that the implementing class has a _#getName() name_ .
-
-== API
-
-[source,java]
-.WithNameGetter.java
-----
-interface WithNameGetter {
-  String getName()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc
deleted file mode 100644
index 73c6441aee..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= WithNameUnique _(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 [...]
-
-== API
-
-[source,java]
-.WithNameUnique.java
-----
-interface WithNameUnique {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc
deleted file mode 100644
index c9e29ef6e4..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= WithReferenceComparable _(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 [...]
-
-== API
-
-[source,java]
-.WithReferenceComparable.java
-----
-interface WithReferenceComparable<T> {
-  void setReference(String reference)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc
deleted file mode 100644
index c8f5f972bb..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= WithReferenceGetter _(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 [...]
-
-Indicates that the implementing class has a _#getReference() reference_ .
-
-== API
-
-[source,java]
-.WithReferenceGetter.java
-----
-interface WithReferenceGetter {
-  String getReference()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc
deleted file mode 100644
index fac46b99fc..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= WithReferenceUnique _(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 [...]
-
-== API
-
-[source,java]
-.WithReferenceUnique.java
-----
-interface WithReferenceUnique {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc
deleted file mode 100644
index a1b0dfd01b..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= WithSequence _(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 [...]
-
-== API
-
-[source,java]
-.WithSequence.java
-----
-interface WithSequence {
-  BigInteger getSequence()
-  void setSequence(BigInteger sequence)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc
deleted file mode 100644
index d0f48f93ad..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= WithStartDate _(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 [...]
-
-== API
-
-[source,java]
-.WithStartDate.java
-----
-interface WithStartDate {
-  LocalDate getStartDate()
-  void setStartDate(LocalDate startDate)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc
deleted file mode 100644
index af555d8ef8..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= WithTitleComparable _(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 [...]
-
-== API
-
-[source,java]
-.WithTitleComparable.java
-----
-interface WithTitleComparable<T> {
-  void setTitle(String title)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc
deleted file mode 100644
index 3384742082..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= WithTitleGetter _(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 [...]
-
-Indicates that the implementing class has a _#getTitle() title_ .
-
-== API
-
-[source,java]
-.WithTitleGetter.java
-----
-interface WithTitleGetter {
-  String getTitle()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc
deleted file mode 100644
index ad05f891b2..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= WithTitleUnique _(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 [...]
-
-== API
-
-[source,java]
-.WithTitleUnique.java
-----
-interface WithTitleUnique {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService.adoc
deleted file mode 100644
index fa0f6b7210..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-= DocxService _(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 [...]
-
-Merges input HTML against a provided _docx_ template, generating a _Word docx_ .
-
-== API
-
-[source,java]
-.DocxService.java
-----
-interface DocxService {
-  WordprocessingMLPackage loadPackage(InputStream docxTemplate)     // <.>
-  void merge(MergeParams mergeDefn)     // <.>
-}
-----
-
-<.> xref:#loadPackage__InputStream[loadPackage(InputStream)]
-+
---
-Load and return an in-memory representation of a docx.
---
-<.> xref:#merge__MergeParams[merge(MergeParams)]
-+
---
-Merge the input arguments (as HTML) against the Docx template, writing out as a Word docx..
---
-
-== Members
-
-[#loadPackage__InputStream]
-=== loadPackage(InputStream)
-
-Load and return an in-memory representation of a docx.
-
-This is public API because building the in-memory structure can be quite slow. Thus, clients can use this method to cache the in-memory structure, and pass it in the _MergeParams_ (through the _MergeParams.Builder#docxTemplateAsWpMlPackage(WordprocessingMLPackage) builder method_ )
-
-[#merge__MergeParams]
-=== merge(MergeParams)
-
-Merge the input arguments (as HTML) against the Docx template, writing out as a Word docx..
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService~MergeParams.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService~MergeParams.adoc
deleted file mode 100644
index eed5bebb94..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/docx/applib/DocxService~MergeParams.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= DocxService.MergeParams
-: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 [...]
-
-== API
-
-[source,java]
-.DocxService~MergeParams.java
-----
-class MergeParams {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
deleted file mode 100644
index 867b4d6c98..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= IsisModuleSubdomainsExcelTesting
-: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 [...]
-
-== API
-
-[source,java]
-.IsisModuleSubdomainsExcelTesting.java
-----
-class IsisModuleSubdomainsExcelTesting {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
deleted file mode 100644
index ff9fab2ade..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= IsisModuleSubdomainsSpringApplib
-: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 [...]
-
-== API
-
-[source,java]
-.IsisModuleSubdomainsSpringApplib.java
-----
-class IsisModuleSubdomainsSpringApplib {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
deleted file mode 100644
index 9592253f07..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= IsisModuleSubdomainsXDocReportApplib
-: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 [...]
-
-== API
-
-[source,java]
-.IsisModuleSubdomainsXDocReportApplib.java
-----
-class IsisModuleSubdomainsXDocReportApplib {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService.adoc
deleted file mode 100644
index 0c794d4e53..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= XDocReportService _(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 [...]
-
-== API
-
-[source,java]
-.XDocReportService.java
-----
-interface XDocReportService {
-  byte[] render(byte[] templateBytes, XDocReportModel dataModel, OutputType outputType)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService~XDocReportModel.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService~XDocReportModel.adoc
deleted file mode 100644
index 5b5e904ec0..0000000000
--- a/antora/components/refguide-index/modules/subdomains/pages/index/xdocreport/applib/XDocReportService~XDocReportModel.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= XDocReportService.XDocReportModel _(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 [...]
-
-== API
-
-[source,java]
-.XDocReportService~XDocReportModel.java
-----
-interface XDocReportModel {
-  Map<String, Data> getContextData()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
index 5a4e76c6e4..893b345fb7 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
@@ -10,7 +10,6 @@ A library of architecture tests to ensure coding conventions are followed for do
 ----
 class ArchitectureDomainRules {
   ArchRule every_DomainObject_must_specify_logicalTypeName()     // <.>
-  ArchRule every_DomainService_must_specify_logicalTypeName()     // <.>
   ArchRule every_logicalTypeName_must_be_unique()     // <.>
   ArchRule every_DomainObject_must_also_be_annotated_with_DomainObjectLayout()     // <.>
   ArchRule every_DomainService_must_also_be_annotated_with_DomainServiceLayout()     // <.>
@@ -37,11 +36,6 @@ class ArchitectureDomainRules {
 --
 This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
 --
-<.> xref:#every_DomainService_must_specify_logicalTypeName__[every_DomainService_must_specify_logicalTypeName()]
-+
---
-This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
---
 <.> xref:#every_logicalTypeName_must_be_unique__[every_logicalTypeName_must_be_unique()]
 +
 --
@@ -120,11 +114,6 @@ This rule requires that finders of repos reutrn either _java.util.Collection_ s
 
 This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
 
-[#every_DomainService_must_specify_logicalTypeName__]
-=== every_DomainService_must_specify_logicalTypeName()
-
-This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
-
 [#every_logicalTypeName_must_be_unique__]
 === every_logicalTypeName_must_be_unique()
 
diff --git a/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/fixturescripts/FixtureScript.adoc b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/fixturescripts/FixtureScript.adoc
index a0fe709597..9b0e5f69c6 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/fixturescripts/FixtureScript.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/fixturescripts/FixtureScript.adoc
@@ -1,7 +1,7 @@
 = FixtureScript
 :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 [...]
 
-Responsible for setting up the system (or more likely a part of the system) for the purpose of prototyping/demos or for integraton testing.
+Responsible for setting up the system (or more likely a part of the system) for the purpose of prototyping/demos or for integration testing.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/modules/ModuleWithFixturesService.adoc b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/modules/ModuleWithFixturesService.adoc
index 4f70c0a6ee..79a92ea42e 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/modules/ModuleWithFixturesService.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/modules/ModuleWithFixturesService.adoc
@@ -7,7 +7,6 @@
 .ModuleWithFixturesService.java
 ----
 class ModuleWithFixturesService {
-  ModuleWithFixturesService(SpringBeansService springBeansService)
   FixtureScript getRefDataSetupFixture()
   FixtureScript getTeardownFixture()
   List<ModuleWithFixturesDescriptor> modules()
diff --git a/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc b/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
index 6b5c0723a6..86432a76db 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
@@ -7,7 +7,6 @@
 .H2ManagerMenu.java
 ----
 class H2ManagerMenu {
-  public static final String LOGICAL_TYPE_NAME;
   H2ManagerMenu(WebModuleH2Console webModule)
   LocalResourcePath openH2Console()
   boolean hideOpenH2Console()
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/ActionParameterListBuilder.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/ActionParameterListBuilder.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/ActionParameterListBuilder.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/ActionParameterListBuilder.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/RestfulClient.adoc
similarity index 55%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/RestfulClient.adoc
index 4e40cc0147..3859e8871f 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClient.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/RestfulClient.adoc
@@ -1,7 +1,7 @@
 = RestfulClient
 :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 [...]
 
-Setup the Restful Client with Basic-Auth:Synchronous example:Asynchronous example:Maven Setup:
+Setup the Restful Client with Basic-Auth:Make a Request and then digest the Response:Maven Setup:
 
 For example:
 
@@ -28,42 +28,17 @@ Entity args = client.arguments()
 
 Response response = request.post(args);
 
-ResponseDigest digest = client.digest(response, MyObject.class);_ 
+Try digest = client.digest(response, MyObject.class);_ 
 
 if(digest.isSuccess()) {
-    System.out.println("result: "+ digest.getEntities().getSingletonOrFail().get$$instanceId());
+    System.out.println("result: "+ digest.getValue().orElseThrow().get$$instanceId());
 } else {
-    digest.getFailureCause().printStackTrace();
+    digest.getFailure().get().printStackTrace();
 }
 ----
 
 ----
- _Builder request = client.request(
-                "services/myService/actions/lookupMyObjectById/invoke",
-                SuppressionType.RO);
-
-Entity args = client.arguments()
-        .addActionParameter("id", "12345")
-        .build();
-
-Future asyncResponse = request
-        .async()
-        .post(args);
-
-CompletableFuture> digestFuture =
-                client.digest(asyncResponse, MyObject.class);
-
-ResponseDigest digest = digestFuture.get(); // blocking_ 
-
-if(digest.isSuccess()) {
-    System.out.println("result: "+ digest.getEntities().getSingletonOrFail().get$$instanceId());
-} else {
-    digest.getFailureCause().printStackTrace();
-}
-----
-
-----
- _org.apache.isis.coreisis-core-applib2.0.0-M2-SNAPSHOTorg.glassfish.jersey.extjersey-spring52.29.1org.glassfishjavax.json1.1.4org.eclipse.persistenceorg.eclipse.persistence.moxy2.7.5_ 
+ _org.glassfish.jersey.extjersey-spring52.35_ 
 ----
 
 == API
@@ -79,10 +54,8 @@ class RestfulClient {
   Builder request(String path, SuppressionType... suppressionTypes)
   Builder request(String path, EnumSet<SuppressionType> suppressionTypes)
   ActionParameterListBuilder arguments()
-  ResponseDigest<T> digest(Response response, Class<T> entityType)
-  ResponseDigest<T> digestList(Response response, Class<T> entityType, GenericType<List<T>> genericType)
-  CompletableFuture<ResponseDigest<T>> digest(Future<Response> asyncResponse, Class<T> entityType)
-  CompletableFuture<ResponseDigest<T>> digestList(Future<Response> asyncResponse, Class<T> entityType, GenericType<List<T>> genericType)
+  Try<T> digest(Response response, Class<T> entityType)
+  Try<Can<T>> digestList(Response response, Class<T> entityType, GenericType<List<T>> genericType)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientConfig.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/RestfulClientConfig.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/RestfulClientConfig.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/RestfulClientConfig.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/auth/BasicAuthFilter.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/auth/BasicAuthFilter.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/auth/BasicAuthFilter.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/auth/BasicAuthFilter.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/log/ClientConversationFilter.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/log/ClientConversationFilter.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/log/ClientConversationFilter.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/log/ClientConversationFilter.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/restclient/log/ClientConversationLogger.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/log/ClientConversationLogger.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/restclient/log/ClientConversationLogger.adoc
rename to antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/client/log/ClientConversationLogger.adoc
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 247cf51f4f..3b48dec3ba 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -152,7 +152,7 @@ Type: pom
 Directory: /mavendeps/webapp
 ----
 |Defines a module that can be almost used as a single dependency for running
-an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
+an Apache Isis webapp (Wicket, Restful Objects, GraphQL and Shiro security).
 
 Note: Also requires a persistence provider.
 
@@ -474,10 +474,9 @@ o.a.i.testing.fixtures.applib.services.InitialFixtureScriptsInstaller +
 .Dependencies
 ****
 joda-time:joda-time:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
+org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-spring-applib:jar:<managed> +
 org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
 ****
 
@@ -723,6 +722,11 @@ skinparam rectangle<<9>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
+skinparam rectangle<<10>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
 package "Examples\n[Software System]" {
   rectangle "==Demo - Domain\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
   rectangle "==Demo - JavaFX\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
@@ -732,6 +736,7 @@ package "Examples\n[Software System]" {
   rectangle "==Demo - Wicket (Common)\n<size:10>[Container: packaging: jar]</size>" <<7>> as 7
   rectangle "==Demo - Wicket/JDO\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
   rectangle "==Demo - Wicket/JPA\n<size:10>[Container: packaging: jar]</size>" <<9>> as 9
+  rectangle "==Demo - Wicket/JPA (with GraphQL)\n<size:10>[Container: packaging: jar]</size>" <<10>> as 10
 }
 2 .[#707070].> 3 : ""
 2 .[#707070].> 4 : ""
@@ -740,6 +745,7 @@ package "Examples\n[Software System]" {
 2 .[#707070].> 7 : ""
 2 .[#707070].> 8 : ""
 2 .[#707070].> 9 : ""
+2 .[#707070].> 10 : ""
 @enduml
 ----
 .Projects/Modules (Examples)
@@ -1158,6 +1164,21 @@ Directory: /examples/demo/wicket/jpa
 org.apache.isis.examples.apps:demo-wicket-common:jar:${project.version} +
 org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
 ****
+
+|Demo - Wicket/JPA (with GraphQL)
+[source,yaml]
+----
+Group: org.apache.isis.examples.apps
+Artifact: demo-wicket-jpa-and-graphql
+Type: jar
+Directory: /examples/demo/wicket/jpa-and-graphql
+----
+|.Dependencies
+****
+org.apache.isis.examples.apps:demo-wicket-common:jar:${project.version} +
+org.apache.isis.incubator.viewer:isis-viewer-graphql-viewer:jar:<managed> +
+org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
+****
 |===
 
 == Root
@@ -1243,7 +1264,7 @@ Type: pom
 Directory: /bom
 ----
 |Apache Isis Bill of Material (BOM).
-Als the parent POM for the core framework + extensions, starter parent pom for starter apps.
+Also the parent POM for the core framework and extensions.
 
 |Apache Isis Supplemental - Legal Info
 [source,yaml]
@@ -1415,8 +1436,9 @@ skinparam rectangle<<10>> {
 }
 package "Core\n[Software System]" {
   rectangle "==Apache Isis - JDK Supplemental\n<size:10>[Container: packaging: pom]</size>" <<14>> as 14
+  rectangle "==Apache Isis Api - AppLib\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
+  rectangle "==Apache Isis Api - Schemas\n<size:10>[Container: packaging: jar]</size>" <<15>> as 15
   rectangle "==Apache Isis Core\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-  rectangle "==Apache Isis Core - AppLib\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
   rectangle "==Apache Isis Core - Code Gen (ByteBuddy)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
   rectangle "==Apache Isis Core - Configuration\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
   rectangle "==Apache Isis Core - Interaction\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
@@ -1424,13 +1446,13 @@ package "Core\n[Software System]" {
   rectangle "==Apache Isis Core - MetaModel\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
   rectangle "==Apache Isis Core - Runtime\n<size:10>[Container: packaging: jar]</size>" <<9>> as 9
   rectangle "==Apache Isis Core - Runtime Services\n<size:10>[Container: packaging: jar]</size>" <<10>> as 10
-  rectangle "==Apache Isis Core - Schemas\n<size:10>[Container: packaging: jar]</size>" <<15>> as 15
   rectangle "==Apache Isis Core - Security\n<size:10>[Container: packaging: jar]</size>" <<11>> as 11
   rectangle "==Apache Isis Core - Transaction\n<size:10>[Container: packaging: jar]</size>" <<12>> as 12
   rectangle "==Apache Isis Core - WebApp\n<size:10>[Container: packaging: jar]</size>" <<13>> as 13
 }
 2 .[#707070].> 14 : ""
 2 .[#707070].> 3 : ""
+2 .[#707070].> 15 : ""
 2 .[#707070].> 4 : ""
 2 .[#707070].> 5 : ""
 2 .[#707070].> 6 : ""
@@ -1438,7 +1460,6 @@ package "Core\n[Software System]" {
 2 .[#707070].> 8 : ""
 2 .[#707070].> 9 : ""
 2 .[#707070].> 10 : ""
-2 .[#707070].> 15 : ""
 2 .[#707070].> 11 : ""
 2 .[#707070].> 12 : ""
 2 .[#707070].> 13 : ""
@@ -1464,7 +1485,7 @@ Directory: /core
 org.projectlombok:lombok:jar:<managed> +
 ****
 
-|Apache Isis Core - AppLib
+|Apache Isis Api - AppLib
 [source,yaml]
 ----
 Group: org.apache.isis.core
@@ -1506,7 +1527,7 @@ org.jmock:jmock:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/annotation/BookmarkPolicy.adoc[BookmarkPolicy], xref:refguide:applib:index/annotation/Bounding.adoc[Bounding], xref:refguide:applib:index/annotation/Collecti [...]
+xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/annotation/BookmarkPolicy.adoc[BookmarkPolicy], xref:refguide:applib:index/annotation/Bounding.adoc[Bounding], xref:refguide:applib:index/annotation/Collecti [...]
 ****
 
 |Apache Isis Core - Code Gen (ByteBuddy)
@@ -1560,7 +1581,7 @@ o.a.i.core.config.viewer.web.WebAppContextPath +
 org.apache.isis.commons:isis-commons:jar:<managed> +
 org.apache.isis.core:isis-applib:jar:<managed> +
 org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.hibernate.validator:hibernate-validator:jar:<managed> +
+org.hibernate:hibernate-validator:jar:<managed> +
 org.springframework.boot:spring-boot-configuration-processor:jar:<managed> +
 ****
 
@@ -1702,7 +1723,6 @@ org.apache.isis.core:isis-applib:jar:<managed> +
 org.apache.isis.core:isis-core-config:jar:<managed> +
 org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
 org.apache.isis.core:isis-core-security:jar:<managed> +
-org.hibernate.validator:hibernate-validator:jar:<managed> +
 org.jmock:jmock:jar:<managed> +
 ****
 
@@ -1779,6 +1799,7 @@ o.a.i.core.runtimeservices.routing.RoutingServiceDefault +
 o.a.i.core.runtimeservices.scratchpad.ScratchpadDefault +
 o.a.i.core.runtimeservices.session.InteractionServiceDefault +
 o.a.i.core.runtimeservices.sitemap.SitemapServiceDefault +
+o.a.i.core.runtimeservices.spring.SpringBeansService +
 o.a.i.core.runtimeservices.transaction.TransactionServiceSpring +
 o.a.i.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression +
 o.a.i.core.runtimeservices.user.ImpersonateMenuAdvisorDefault +
@@ -1799,7 +1820,7 @@ org.hsqldb:hsqldb:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:core:index/runtimeservices/publish/ObjectLifecyclePublisherDefault.adoc[ObjectLifecyclePublisherDefault], xref:refguide:core:index/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:refguide:core:index/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault]
+xref:refguide:core:index/runtimeservices/publish/ObjectLifecyclePublisherDefault.adoc[ObjectLifecyclePublisherDefault], xref:refguide:core:index/runtimeservices/spring/BeanDescriptor.adoc[BeanDescriptor], xref:refguide:core:index/runtimeservices/spring/ContextBeans.adoc[ContextBeans], xref:refguide:core:index/runtimeservices/spring/SpringBeansService.adoc[SpringBeansService], xref:refguide:core:index/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xre [...]
 ****
 
 |Apache Isis Core - Security
@@ -1913,7 +1934,9 @@ had been removed with later JDK versions. Also brings in Jakarta EE API.
 com.fasterxml.woodstox:woodstox-core:jar:<managed> +
 com.google.code.findbugs:jsr305:jar:<managed> +
 com.sun.xml.bind:jaxb-impl:jar:<managed> +
-com.sun.xml.ws:jaxws-ri:pom:<managed> +
+com.sun.xml.bind.external:relaxng-datatype:jar:2.3.6 +
+com.sun.xml.bind.external:rngom:jar:2.3.6 +
+com.sun.xml.ws:jaxws-ri:pom:${jaxws-ri.version} +
 com.sun.xml.ws:jaxws-rt:jar:${jaxws-ri.version} +
 jakarta.platform:jakarta.jakartaee-api:jar:<managed> +
 org.codehaus.woodstox:stax2-api:jar:<managed> +
@@ -1921,7 +1944,7 @@ org.eclipse.persistence:org.eclipse.persistence.moxy:jar:<managed> +
 org.eclipse.persistence:org.eclipse.persistence.sdo:jar:<managed> +
 ****
 
-|Apache Isis Core - Schemas
+|Apache Isis Api - Schemas
 [source,yaml]
 ----
 Group: org.apache.isis.core
@@ -2360,69 +2383,6 @@ org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
 
 == Security
 
-[plantuml,Security,svg]
-----
-@startuml(id=Security)
-title Security - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Security\n[Software System]" {
-  rectangle "==Apache Isis Security - Spring\n<size:10>[Container: packaging: jar]</size>" <<2>> as 2
-}
-@enduml
-----
-.Projects/Modules (Security)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Security - Spring
-[source,yaml]
-----
-Group: org.apache.isis.security
-Artifact: isis-security-spring
-Type: jar
-Directory: /security/spring
-----
-|Authentication using Spring Security
-
-.Components
-****
-o.a.i.security.spring.authconverters.AuthenticationConverterOfAuthenticatedPrincipal +
-o.a.i.security.spring.authconverters.AuthenticationConverterOfStringPrincipal +
-o.a.i.security.spring.authconverters.AuthenticationConverterOfUserDetailsPrincipal +
-o.a.i.security.spring.authentication.AuthenticatorSpring +
-o.a.i.security.spring.webmodule.WebModuleSpringSecurity +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.springframework.boot:spring-boot-starter-security:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:security:index/spring/IsisModuleSecuritySpring.adoc[IsisModuleSecuritySpring], xref:refguide:security:index/spring/authconverters/AuthenticationConverter.adoc[AuthenticationConverter], xref:refguide:security:index/spring/authentication/AuthenticatorSpring.adoc[AuthenticatorSpring], xref:refguide:security:index/spring/webmodule/SpringSecurityFilter.adoc[SpringSecurityFilter], xref:refguide:security:index/spring/webmodule/WebModuleSpringSecurity.adoc[WebModuleSpringSecurity]
-****
-|===
-
 === Bypass
 
 [plantuml,Bypass,svg]
@@ -2611,6 +2571,71 @@ xref:refguide:security:index/shiro/IsisModuleSecurityShiro.adoc[IsisModuleSecuri
 ****
 |===
 
+=== Spring
+
+[plantuml,Spring,svg]
+----
+@startuml(id=Spring)
+title Spring - Containers
+caption Artifact Hierarchy (Maven)
+
+skinparam {
+  shadowing false
+  arrowFontSize 10
+  defaultTextAlignment center
+  wrapWidth 200
+  maxMessageSize 100
+}
+hide stereotype
+left to right direction
+skinparam rectangle<<2>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+package "Spring\n[Software System]" {
+  rectangle "==Apache Isis Security - Spring\n<size:10>[Container: packaging: jar]</size>" <<2>> as 2
+}
+@enduml
+----
+.Projects/Modules (Spring)
+[cols="3a,5a", options="header"]
+|===
+|Coordinates |Description 
+
+|Apache Isis Security - Spring
+[source,yaml]
+----
+Group: org.apache.isis.security
+Artifact: isis-security-spring
+Type: jar
+Directory: /security/spring
+----
+|Authentication using Spring Security
+
+.Components
+****
+o.a.i.security.spring.authconverters.AuthenticationConverterOfAuthenticatedPrincipal +
+o.a.i.security.spring.authconverters.AuthenticationConverterOfStringPrincipal +
+o.a.i.security.spring.authconverters.AuthenticationConverterOfUserDetailsPrincipal +
+o.a.i.security.spring.authentication.AuthenticatorSpring +
+o.a.i.security.spring.webmodule.WebModuleSpringSecurity +
+****
+
+.Dependencies
+****
+org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
+org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
+org.apache.isis.core:isis-core-webapp:jar:<managed> +
+org.springframework.boot:spring-boot-starter-security:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:security:index/spring/IsisModuleSecuritySpring.adoc[IsisModuleSecuritySpring], xref:refguide:security:index/spring/authconverters/AuthenticationConverter.adoc[AuthenticationConverter], xref:refguide:security:index/spring/authentication/AuthenticatorSpring.adoc[AuthenticatorSpring], xref:refguide:security:index/spring/webmodule/SpringSecurityFilter.adoc[SpringSecurityFilter], xref:refguide:security:index/spring/webmodule/WebModuleSpringSecurity.adoc[WebModuleSpringSecurity]
+****
+|===
+
 == Viewer
 
 === Common
@@ -2721,19 +2746,26 @@ skinparam rectangle<<7>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
+skinparam rectangle<<8>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
 package "Restful Objects\n[Software System]" {
   rectangle "==Apache Isis Viewer - RO\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
   rectangle "==Apache Isis Viewer - RO (AppLib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Viewer - RO (JAX-RS Resteasy v4)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Viewer - RO (Rendering)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
-  rectangle "==Apache Isis Viewer - RO (Testing)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
-  rectangle "==Apache Isis Viewer - RO (Viewer)\n<size:10>[Container: packaging: jar]</size>" <<7>> as 7
+  rectangle "==Apache Isis Viewer - RO (Client)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
+  rectangle "==Apache Isis Viewer - RO (JAX-RS Resteasy v4)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+  rectangle "==Apache Isis Viewer - RO (Rendering)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
+  rectangle "==Apache Isis Viewer - RO (Testing)\n<size:10>[Container: packaging: jar]</size>" <<7>> as 7
+  rectangle "==Apache Isis Viewer - RO (Viewer)\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
 }
 2 .[#707070].> 3 : ""
 2 .[#707070].> 4 : ""
 2 .[#707070].> 5 : ""
 2 .[#707070].> 6 : ""
 2 .[#707070].> 7 : ""
+2 .[#707070].> 8 : ""
 @enduml
 ----
 .Projects/Modules (Restful Objects)
@@ -2772,6 +2804,26 @@ org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
 xref:refguide:viewer:index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc[IsisModuleViewerRestfulObjectsApplib], xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation], xref:refguide:viewer:index/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation], xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel], xref:refguide:viewer:index/restfulobjects/applib/RelDefinition.adoc[RelDefinition], xref:refguide:viewer:index [...]
 ****
 
+|Apache Isis Viewer - RO (Client)
+[source,yaml]
+----
+Group: org.apache.isis.viewer
+Artifact: isis-viewer-restfulobjects-client
+Type: jar
+Directory: /viewers/restfulobjects/client
+----
+|.Dependencies
+****
+org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
+org.springframework:spring-context:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:viewer:index/restfulobjects/client/ActionParameterListBuilder.adoc[ActionParameterListBuilder], xref:refguide:viewer:index/restfulobjects/client/RestfulClient.adoc[RestfulClient], xref:refguide:viewer:index/restfulobjects/client/RestfulClientConfig.adoc[RestfulClientConfig], xref:refguide:viewer:index/restfulobjects/client/auth/BasicAuthFilter.adoc[BasicAuthFilter], xref:refguide:viewer:index/restfulobjects/client/log/ClientConversationFilter.adoc[ClientConversationFilter], [...]
+****
+
 |Apache Isis Viewer - RO (JAX-RS Resteasy v4)
 [source,yaml]
 ----
@@ -2887,7 +2939,6 @@ org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
 org.apache.isis.core:isis-core-webapp:jar:<managed> +
 org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
 org.apache.isis.viewer:isis-viewer-restfulobjects-rendering:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
 ****
 
 .Document Index Entries
@@ -3901,12 +3952,12 @@ xref:refguide:valuetypes:index/sse/ui/wkt/IsisModuleValSseUiWkt.adoc[IsisModuleV
 ****
 |===
 
-== Mappings
+== Extensions
 
-[plantuml,Mappings,svg]
+[plantuml,Extensions,svg]
 ----
-@startuml(id=Mappings)
-title Mappings - Containers
+@startuml(id=Extensions)
+title Extensions - Containers
 caption Artifact Hierarchy (Maven)
 
 skinparam {
@@ -3918,289 +3969,65 @@ skinparam {
 }
 hide stereotype
 left to right direction
-skinparam rectangle<<2>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-package "Mappings\n[Software System]" {
-  rectangle "==Apache Isis Mappings\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+skinparam rectangle<<22>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
 }
-@enduml
-----
-.Projects/Modules (Mappings)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Mappings
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings
-Type: pom
-Directory: /mappings
-----
-|Libraries and tools to map one bounded context (usually an Apache Isis application) to some other BC (usually
-_not_ an Apache Isis application).
-
-.Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
-|===
-
-=== JAX-RS Client Library
-
-[plantuml,JAX-RS Client Library,svg]
-----
-@startuml(id=JAX-RS_Client_Library)
-title JAX-RS Client Library - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<4>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "JAX-RS Client Library\n[Software System]" {
-  rectangle "==Apache Isis Map - JaxRS Client (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Map - JaxRS Client (impl)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Map - JaxRS Client (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-}
-2 .[#707070].> 3 : ""
-2 .[#707070].> 4 : ""
-@enduml
-----
-.Projects/Modules (JAX-RS Client Library)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Map - JaxRS Client (parent)
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings-jaxrsclient
-Type: pom
-Directory: /mappings/jaxrsclient
-----
-|Integrates JaxRS Client Library
-
-|Apache Isis Map - JaxRS Client (applib)
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings-jaxrsclient-applib
-Type: jar
-Directory: /mappings/jaxrsclient/applib
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-jdk-supplemental:pom:<managed> +
-org.springframework:spring-context:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:extensions:index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc[IsisModuleExtJaxRsClientApplib], xref:refguide:extensions:index/jaxrsclient/applib/client/JaxRsClient.adoc[JaxRsClient], xref:refguide:extensions:index/jaxrsclient/applib/client/JaxRsResponse.adoc[JaxRsResponse]
-****
-
-|Apache Isis Map - JaxRS Client (impl)
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings-jaxrsclient-impl
-Type: jar
-Directory: /mappings/jaxrsclient/testlib
-----
-|.Dependencies
-****
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-****
-|===
-
-=== REST Client
-
-[plantuml,REST Client,svg]
-----
-@startuml(id=REST_Client)
-title REST Client - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "REST Client\n[Software System]" {
-  rectangle "==Apache Isis Ext - REST Client (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Ext - REST Client (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-}
-2 .[#707070].> 3 : ""
-@enduml
-----
-.Projects/Modules (REST Client)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Ext - REST Client (parent)
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings-restclient
-Type: pom
-Directory: /mappings/restclient
-----
-|A client for the Restful Objects Viewer
-
-|Apache Isis Ext - REST Client (applib)
-[source,yaml]
-----
-Group: org.apache.isis.mappings
-Artifact: isis-mappings-restclient-applib
-Type: jar
-Directory: /mappings/restclient/applib
-----
-|A client for the Restful Objects Viewer
-
-.Dependencies
-****
-org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:extensions:index/restclient/ActionParameterListBuilder.adoc[ActionParameterListBuilder], xref:refguide:extensions:index/restclient/IsisModuleExtRestClient.adoc[IsisModuleExtRestClient], xref:refguide:extensions:index/restclient/ResponseDigest.adoc[ResponseDigest], xref:refguide:extensions:index/restclient/RestfulClient.adoc[RestfulClient], xref:refguide:extensions:index/restclient/RestfulClientConfig.adoc[RestfulClientConfig], xref:refguide:extensions:index/restclient/Restf [...]
-****
-|===
-
-== Extensions
-
-[plantuml,Extensions,svg]
-----
-@startuml(id=Extensions)
-title Extensions - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<22>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<23>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<24>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<25>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<26>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<10>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<11>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<12>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<13>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<14>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<15>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<16>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<17>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<18>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<19>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
+skinparam rectangle<<23>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<12>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<13>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<24>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<14>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<15>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<16>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<17>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<18>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<19>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
 }
 skinparam rectangle<<2>> {
   BackgroundColor #438dd5
@@ -4252,57 +4079,58 @@ skinparam rectangle<<21>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
+skinparam rectangle<<10>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
 package "Extensions\n[Software System]" {
   rectangle "==Apache Isis Ext - CORS (impl)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
   rectangle "==Apache Isis Ext - CORS (parent)\n<size:10>[Container: packaging: pom]</size>" <<3>> as 3
-  rectangle "==Apache Isis Ext - Flyway\n<size:10>[Container: packaging: pom]</size>" <<7>> as 7
-  rectangle "==Apache Isis Ext - Flyway Impl\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
-  rectangle "==Apache Isis Ext - Sec Man\n<size:10>[Container: packaging: pom]</size>" <<16>> as 16
-  rectangle "==Apache Isis Ext - Sec Man Applib\n<size:10>[Container: packaging: jar]</size>" <<17>> as 17
-  rectangle "==Apache Isis Ext - Sec Man Encryption (Using Spring)\n<size:10>[Container: packaging: jar]</size>" <<19>> as 19
-  rectangle "==Apache Isis Ext - Sec Man Encryption (Using jbcrypt)\n<size:10>[Container: packaging: jar]</size>" <<18>> as 18
-  rectangle "==Apache Isis Ext - Sec Man Integration\n<size:10>[Container: packaging: jar]</size>" <<20>> as 20
-  rectangle "==Apache Isis Ext - Sec Man Persistence (Using JDO)\n<size:10>[Container: packaging: jar]</size>" <<21>> as 21
-  rectangle "==Apache Isis Ext - Sec Man Persistence (Using JPA)\n<size:10>[Container: packaging: jar]</size>" <<22>> as 22
-  rectangle "==Apache Isis Ext - Sec Man Realm (Using Shiro)\n<size:10>[Container: packaging: jar]</size>" <<23>> as 23
-  rectangle "==Apache Isis Ext - Security - Shiro LDAP Realm (impl)\n<size:10>[Container: packaging: jar]</size>" <<25>> as 25
-  rectangle "==Apache Isis Ext - Security - Shiro LDAP Realm (parent)\n<size:10>[Container: packaging: pom]</size>" <<24>> as 24
-  rectangle "==Apache Isis Ext - Security - Spring Oauth2\n<size:10>[Container: packaging: jar]</size>" <<26>> as 26
-  rectangle "==Apache Isis Ext - Wicket Viewer - Excel Download (parent)\n<size:10>[Container: packaging: pom]</size>" <<5>> as 5
-  rectangle "==Apache Isis Ext - Wicket Viewer - Excel Download (ui)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
-  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (applib)\n<size:10>[Container: packaging: jar]</size>" <<10>> as 10
-  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (parent)\n<size:10>[Container: packaging: pom]</size>" <<9>> as 9
-  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (ui)\n<size:10>[Container: packaging: jar]</size>" <<11>> as 11
-  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (applib)\n<size:10>[Container: packaging: jar]</size>" <<13>> as 13
-  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (metamodel)\n<size:10>[Container: packaging: jar]</size>" <<14>> as 14
-  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (parent)\n<size:10>[Container: packaging: pom]</size>" <<12>> as 12
-  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (ui)\n<size:10>[Container: packaging: jar]</size>" <<15>> as 15
+  rectangle "==Apache Isis Ext - Flyway\n<size:10>[Container: packaging: pom]</size>" <<5>> as 5
+  rectangle "==Apache Isis Ext - Flyway Impl\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
+  rectangle "==Apache Isis Ext - Sec Man\n<size:10>[Container: packaging: pom]</size>" <<14>> as 14
+  rectangle "==Apache Isis Ext - Sec Man Applib\n<size:10>[Container: packaging: jar]</size>" <<15>> as 15
+  rectangle "==Apache Isis Ext - Sec Man Encryption (Using Spring)\n<size:10>[Container: packaging: jar]</size>" <<17>> as 17
+  rectangle "==Apache Isis Ext - Sec Man Encryption (Using jbcrypt)\n<size:10>[Container: packaging: jar]</size>" <<16>> as 16
+  rectangle "==Apache Isis Ext - Sec Man Integration\n<size:10>[Container: packaging: jar]</size>" <<18>> as 18
+  rectangle "==Apache Isis Ext - Sec Man Persistence (Using JDO)\n<size:10>[Container: packaging: jar]</size>" <<19>> as 19
+  rectangle "==Apache Isis Ext - Sec Man Persistence (Using JPA)\n<size:10>[Container: packaging: jar]</size>" <<20>> as 20
+  rectangle "==Apache Isis Ext - Sec Man Realm (Using Shiro)\n<size:10>[Container: packaging: jar]</size>" <<21>> as 21
+  rectangle "==Apache Isis Ext - Security - Shiro LDAP Realm (impl)\n<size:10>[Container: packaging: jar]</size>" <<23>> as 23
+  rectangle "==Apache Isis Ext - Security - Shiro LDAP Realm (parent)\n<size:10>[Container: packaging: pom]</size>" <<22>> as 22
+  rectangle "==Apache Isis Ext - Security - Spring Oauth2\n<size:10>[Container: packaging: jar]</size>" <<24>> as 24
+  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (applib)\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
+  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (parent)\n<size:10>[Container: packaging: pom]</size>" <<7>> as 7
+  rectangle "==Apache Isis Ext - Wicket Viewer - fullcalendar (ui)\n<size:10>[Container: packaging: jar]</size>" <<9>> as 9
+  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (applib)\n<size:10>[Container: packaging: jar]</size>" <<11>> as 11
+  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (metamodel)\n<size:10>[Container: packaging: jar]</size>" <<12>> as 12
+  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (parent)\n<size:10>[Container: packaging: pom]</size>" <<10>> as 10
+  rectangle "==Apache Isis Ext - Wicket Viewer - pdf.js (ui)\n<size:10>[Container: packaging: jar]</size>" <<13>> as 13
   rectangle "==Apache Isis Extensions\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
 }
 3 .[#707070].> 4 : ""
-7 .[#707070].> 8 : ""
-16 .[#707070].> 17 : ""
-16 .[#707070].> 19 : ""
-16 .[#707070].> 18 : ""
-16 .[#707070].> 20 : ""
-16 .[#707070].> 21 : ""
-16 .[#707070].> 22 : ""
-16 .[#707070].> 23 : ""
-24 .[#707070].> 25 : ""
 5 .[#707070].> 6 : ""
-9 .[#707070].> 10 : ""
-9 .[#707070].> 11 : ""
-12 .[#707070].> 13 : ""
-12 .[#707070].> 14 : ""
-12 .[#707070].> 15 : ""
+14 .[#707070].> 15 : ""
+14 .[#707070].> 17 : ""
+14 .[#707070].> 16 : ""
+14 .[#707070].> 18 : ""
+14 .[#707070].> 19 : ""
+14 .[#707070].> 20 : ""
+14 .[#707070].> 21 : ""
+22 .[#707070].> 23 : ""
+7 .[#707070].> 8 : ""
+7 .[#707070].> 9 : ""
+10 .[#707070].> 11 : ""
+10 .[#707070].> 12 : ""
+10 .[#707070].> 13 : ""
 2 .[#707070].> 3 : ""
-2 .[#707070].> 7 : ""
-2 .[#707070].> 16 : ""
-2 .[#707070].> 24 : ""
-2 .[#707070].> 26 : ""
 2 .[#707070].> 5 : ""
-2 .[#707070].> 9 : ""
-2 .[#707070].> 12 : ""
+2 .[#707070].> 14 : ""
+2 .[#707070].> 22 : ""
+2 .[#707070].> 24 : ""
+2 .[#707070].> 7 : ""
+2 .[#707070].> 10 : ""
 @enduml
 ----
 .Projects/Modules (Extensions)
@@ -4357,40 +4185,6 @@ org.springframework:spring-web:jar:<managed> +
 xref:refguide:extensions:index/cors/impl/IsisModuleExtCors.adoc[IsisModuleExtCors]
 ****
 
-|Apache Isis Ext - Wicket Viewer - Excel Download (parent)
-[source,yaml]
-----
-Group: org.apache.isis.extensions
-Artifact: isis-extensions-exceldownload
-Type: pom
-Directory: /extensions/vw/exceldownload
-----
-|A component for Apache Isis' Wicket viewer, providing an alternative representation of collections to be downloaded as an Excel spreadsheet.
-
-|Apache Isis Ext - Wicket Viewer - Excel Download (ui)
-[source,yaml]
-----
-Group: org.apache.isis.extensions
-Artifact: isis-extensions-exceldownload-ui
-Type: jar
-Directory: /extensions/vw/exceldownload/ui
-----
-|.Components
-****
-o.a.i.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory +
-****
-
-.Dependencies
-****
-org.apache.isis.subdomains:isis-subdomains-poi:pom:${project.version} +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc[IsisModuleExtExcelDownloadUi], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
-****
-
 |Apache Isis Ext - Flyway
 [source,yaml]
 ----
@@ -4812,12 +4606,12 @@ xref:refguide:extensions:index/spring/security/oauth2/IsisModuleExtSpringSecurit
 ****
 |===
 
-=== Core: Command Log
+=== Applib: Excel
 
-[plantuml,Core: Command Log,svg]
+[plantuml,Applib: Excel,svg]
 ----
-@startuml(id=Core:_Command_Log)
-title Core: Command Log - Containers
+@startuml(id=Applib:_Excel)
+title Applib: Excel - Containers
 caption Artifact Hierarchy (Maven)
 
 skinparam {
@@ -4849,11 +4643,216 @@ skinparam rectangle<<5>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-package "Core: Command Log\n[Software System]" {
-  rectangle "==Apache Isis Ext - Command Log\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-  rectangle "==Apache Isis Ext - Command Log API\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Ext - Command Log Implementation (JDO)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Ext - Command Log Implementation (JPA)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+skinparam rectangle<<6>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<7>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<8>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+package "Applib: Excel\n[Software System]" {
+  rectangle "==Apache Isis Ext - Excel (Fixtures)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
+  rectangle "==Apache Isis Ext - Excel (Integ Tests)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+  rectangle "==Apache Isis Ext - Excel (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
+  rectangle "==Apache Isis Ext - Excel (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+  rectangle "==Apache Isis Ext - Wicket Viewer - Excel Download (parent)\n<size:10>[Container: packaging: pom]</size>" <<7>> as 7
+  rectangle "==Apache Isis Ext - Wicket Viewer - Excel Download (ui)\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
+  rectangle "==Apache Isis Sub - Excel (testing support)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
+}
+2 .[#707070].> 4 : ""
+2 .[#707070].> 5 : ""
+2 .[#707070].> 3 : ""
+2 .[#707070].> 6 : ""
+7 .[#707070].> 8 : ""
+@enduml
+----
+.Projects/Modules (Applib: Excel)
+[cols="3a,5a", options="header"]
+|===
+|Coordinates |Description 
+
+|Apache Isis Ext - Excel (parent)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-excel
+Type: pom
+Directory: /extensions/applib/excel
+----
+|A domain service for Apache Isis', allowing collections
+of (view model) objects to be exported/imported to/from an
+Excel spreadsheet.  Also support for excel-based fixtures.
+
+|Apache Isis Ext - Excel (applib)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-excel-applib
+Type: jar
+Directory: /extensions/applib/excel/applib
+----
+|.Components
+****
+o.a.i.extensions.excel.applib.service.ExcelServiceDefault +
+****
+
+.Dependencies
+****
+org.apache.isis.core:isis-applib:jar:<managed> +
+org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
+org.apache.isis.core:isis-core-runtime:jar:<managed> +
+org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
+org.apache.poi:poi-ooxml:jar:<managed> +
+org.apache.poi:poi-ooxml-lite:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:extensions:index/excel/applib/IsisModuleExtExcelApplib.adoc[IsisModuleExtExcelApplib], xref:refguide:extensions:index/excel/applib/dom/AggregationType.adoc[AggregationType], xref:refguide:extensions:index/excel/applib/dom/ExcelMetaDataEnabled.adoc[ExcelMetaDataEnabled], xref:refguide:extensions:index/excel/applib/dom/ExcelService.adoc[ExcelService], xref:refguide:extensions:index/excel/applib/dom/HyperLink.adoc[HyperLink], xref:refguide:extensions:index/excel/applib/dom/Piv [...]
+****
+
+|Apache Isis Ext - Excel (Fixtures)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-excel-fixtures
+Type: jar
+Directory: /extensions/applib/excel/fixture
+----
+|.Dependencies
+****
+org.apache.isis.core:isis-applib:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-excel-applib:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-excel-testing:jar:<managed> +
+org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
+org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
+org.projectlombok:lombok:jar:<managed> +
+****
+
+|Apache Isis Ext - Excel (Integ Tests)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-excel-integtests
+Type: jar
+Directory: /extensions/applib/excel/integtests
+----
+|.Dependencies
+****
+org.apache.isis.extensions:isis-extensions-excel-fixtures:jar:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
+org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
+org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
+org.hsqldb:hsqldb:jar:<managed> +
+****
+
+|Apache Isis Sub - Excel (testing support)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-excel-testing
+Type: jar
+Directory: /extensions/applib/excel/testing
+----
+|.Dependencies
+****
+org.apache.isis.core:isis-core-metamodel:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-excel-applib:jar:<managed> +
+org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
+org.projectlombok:lombok:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:extensions:index/excel/testing/ExcelFixture.adoc[ExcelFixture], xref:refguide:extensions:index/excel/testing/ExcelFixture2.adoc[ExcelFixture2], xref:refguide:extensions:index/excel/testing/ExcelFixtureRowHandler.adoc[ExcelFixtureRowHandler], xref:refguide:extensions:index/excel/testing/ExcelFixtureWorkbookHandler.adoc[ExcelFixtureWorkbookHandler], xref:refguide:extensions:index/excel/testing/FixtureAwareRowHandler.adoc[FixtureAwareRowHandler], xref:refguide:extensions:index [...]
+****
+
+|Apache Isis Ext - Wicket Viewer - Excel Download (parent)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-exceldownload
+Type: pom
+Directory: /extensions/vw/exceldownload
+----
+|A component for Apache Isis' Wicket viewer, providing an alternative representation of collections to be downloaded as an Excel spreadsheet.
+
+|Apache Isis Ext - Wicket Viewer - Excel Download (ui)
+[source,yaml]
+----
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-exceldownload-ui
+Type: jar
+Directory: /extensions/vw/exceldownload/ui
+----
+|.Components
+****
+o.a.i.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory +
+****
+
+.Dependencies
+****
+org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
+org.apache.poi:poi-ooxml:jar:<managed> +
+org.apache.poi:poi-ooxml-lite:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc[IsisModuleExtExcelDownloadUi], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
+****
+|===
+
+=== Core: Command Log
+
+[plantuml,Core: Command Log,svg]
+----
+@startuml(id=Core:_Command_Log)
+title Core: Command Log - Containers
+caption Artifact Hierarchy (Maven)
+
+skinparam {
+  shadowing false
+  arrowFontSize 10
+  defaultTextAlignment center
+  wrapWidth 200
+  maxMessageSize 100
+}
+hide stereotype
+left to right direction
+skinparam rectangle<<2>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<3>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<4>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<5>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+package "Core: Command Log\n[Software System]" {
+  rectangle "==Apache Isis Ext - Command Log\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+  rectangle "==Apache Isis Ext - Command Log API\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
+  rectangle "==Apache Isis Ext - Command Log Implementation (JDO)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
+  rectangle "==Apache Isis Ext - Command Log Implementation (JPA)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
 }
 2 .[#707070].> 3 : ""
 2 .[#707070].> 4 : ""
@@ -4883,14 +4882,27 @@ Artifact: isis-extensions-command-log-applib
 Type: jar
 Directory: /extensions/core/command-log/applib
 ----
-|.Dependencies
+|.Components
+****
+o.a.i.extensions.commandlog.applib.command.CommandLog$TableColumnOrderDefault +
+o.a.i.extensions.commandlog.applib.command.CommandLog$TitleProvider +
+o.a.i.extensions.commandlog.applib.command.subscriber.CommandSubscriberForCommandLog +
+****
+
+.Dependencies
 ****
 org.apache.isis.core:isis-applib:jar:<managed> +
 org.apache.isis.core:isis-core-config:jar:<managed> +
 org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-unittests:pom:<managed> +
 org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
+org.datanucleus:javax.jdo:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:extensions:index/commandlog/applib/command/subscriber/CommandSubscriberForCommandLog.adoc[CommandSubscriberForCommandLog], xref:refguide:extensions:index/commandlog/applib/command/ui/CommandLogServiceMenu.adoc[CommandLogServiceMenu]
 ****
 
 |Apache Isis Ext - Command Log Implementation (JDO)
@@ -4903,23 +4915,20 @@ Directory: /extensions/core/command-log/jdo
 ----
 |.Components
 ****
-o.a.i.extensions.commandlog.jdo.CommandSubscriberForJdo +
-o.a.i.extensions.commandlog.jdo.entities.CommandJdo$TableColumnOrderDefault +
-o.a.i.extensions.commandlog.jdo.entities.CommandJdo$TitleProvider +
 o.a.i.extensions.commandlog.jdo.entities.CommandJdoRepository +
 ****
 
 .Dependencies
 ****
 org.apache.isis.extensions:isis-extensions-command-log-applib:jar:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-unittests:pom:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/commandlog/jdo/CommandSubscriberForJdo.adoc[CommandSubscriberForJdo], xref:refguide:extensions:index/commandlog/jdo/IsisModuleExtCommandLogJdo.adoc[IsisModuleExtCommandLogJdo], xref:refguide:extensions:index/commandlog/jdo/mixins/HasInteractionId_command.adoc[HasInteractionId_command], xref:refguide:extensions:index/commandlog/jdo/mixins/HasUsername_recentCommandsByUser.adoc[HasUsername_recentCommandsByUser], xref:refguide:extensions:index/commandlog/jdo/mi [...]
+xref:refguide:extensions:index/commandlog/jdo/IsisModuleExtCommandLogJdo.adoc[IsisModuleExtCommandLogJdo], xref:refguide:extensions:index/commandlog/jdo/mixins/HasInteractionId_command.adoc[HasInteractionId_command], xref:refguide:extensions:index/commandlog/jdo/mixins/HasUsername_recentCommandsByUser.adoc[HasUsername_recentCommandsByUser], xref:refguide:extensions:index/commandlog/jdo/mixins/Object_recentCommands.adoc[Object_recentCommands]
 ****
 
 |Apache Isis Ext - Command Log Implementation (JPA)
@@ -4932,17 +4941,15 @@ Directory: /extensions/core/command-log/jpa
 ----
 |.Components
 ****
-o.a.i.extensions.commandlog.jpa.entities.CommandJpa$TableColumnOrderDefault +
-o.a.i.extensions.commandlog.jpa.entities.CommandJpa$TitleProvider +
 o.a.i.extensions.commandlog.jpa.entities.CommandJpaRepository +
 ****
 
 .Dependencies
 ****
 org.apache.isis.extensions:isis-extensions-command-log-applib:jar:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-unittests:pom:<managed> +
 org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
 ****
 
 .Document Index Entries
@@ -5029,14 +5036,12 @@ org.apache.isis.core:isis-core-config:jar:<managed> +
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
 org.apache.isis.core:isis-schema:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-command-log-applib:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed> +
 org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc[IsisModuleExtCommandReplayPrimary], xref:refguide:extensions:index/commandreplay/primary/config/PrimaryConfig.adoc[PrimaryConfig], xref:refguide:extensions:index/commandreplay/primary/mixins/Object_openOnSecondary.adoc[Object_openOnSecondary], xref:refguide:extensions:index/commandreplay/primary/restapi/CommandRetrievalService.adoc[CommandRetrievalService], xref:refguide:extensions:index/commandre [...]
+xref:refguide:extensions:index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc[IsisModuleExtCommandReplayPrimary], xref:refguide:extensions:index/commandreplay/primary/config/PrimaryConfig.adoc[PrimaryConfig], xref:refguide:extensions:index/commandreplay/primary/mixins/Object_openOnSecondary.adoc[Object_openOnSecondary], xref:refguide:extensions:index/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.adoc[CommandRetrievalOnPrimaryService], xref:refguide:extensio [...]
 ****
 
 |Apache Isis Ext - Command Replay for Secondary
@@ -5065,695 +5070,26 @@ org.apache.isis.core:isis-core-config:jar:<managed> +
 org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
 org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-command-log-applib:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-quartz-impl:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:extensions:index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc[IsisModuleExtCommandReplaySecondary], xref:refguide:extensions:index/commandreplay/secondary/SecondaryStatus.adoc[SecondaryStatus], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc[CommandReplayAnalyser], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc[CommandReplayAnalyserException], xref:refguide:ex [...]
-****
-|===
-
-=== Core: Quartz
-
-[plantuml,Core: Quartz,svg]
-----
-@startuml(id=Core:_Quartz)
-title Core: Quartz - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Core: Quartz\n[Software System]" {
-  rectangle "==Apache Isis Ext - Quartz\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-  rectangle "==Apache Isis Ext - Quartz Impl\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-}
-2 .[#707070].> 3 : ""
-@enduml
-----
-.Projects/Modules (Core: Quartz)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Ext - Quartz
-[source,yaml]
-----
-Group: org.apache.isis.extensions
-Artifact: isis-extensions-quartz
-Type: pom
-Directory: /extensions/core/quartz
-----
-|Integrates Quartz
-
-|Apache Isis Ext - Quartz Impl
-[source,yaml]
-----
-Group: org.apache.isis.extensions
-Artifact: isis-extensions-quartz-impl
-Type: jar
-Directory: /extensions/core/quartz/impl
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-org.springframework.boot:spring-boot-starter-quartz:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:extensions:index/quartz/IsisModuleExtQuartzImpl.adoc[IsisModuleExtQuartzImpl], xref:refguide:extensions:index/quartz/context/JobExecutionData.adoc[JobExecutionData], xref:refguide:extensions:index/quartz/spring/AutowiringSpringBeanJobFactory.adoc[AutowiringSpringBeanJobFactory]
-****
-|===
-
-=== Security: Secman
-
-=== Security: Shiro LDAP Realm
-
-=== RO Viewer: CORS
-
-=== Wicket Viewer: Excel Download
-
-=== Wicket Viewer: Full Calendar
-
-=== Wicket Viewer: Pdf.js
-
-== Subdomains
-
-[plantuml,Subdomains,svg]
-----
-@startuml(id=Subdomains)
-title Subdomains - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<11>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<12>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<13>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<4>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<5>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<6>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<7>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<8>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<9>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<10>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Subdomains\n[Software System]" {
-  rectangle "==Apache Isis Sub - Docx (applib)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Sub - Docx (parent)\n<size:10>[Container: packaging: pom]</size>" <<3>> as 3
-  rectangle "==Apache Isis Sub - Freemarker (applib)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
-  rectangle "==Apache Isis Sub - Freemarker (parent)\n<size:10>[Container: packaging: pom]</size>" <<5>> as 5
-  rectangle "==Apache Isis Sub - Ognl (applib)\n<size:10>[Container: packaging: jar]</size>" <<8>> as 8
-  rectangle "==Apache Isis Sub - Ognl (parent)\n<size:10>[Container: packaging: pom]</size>" <<7>> as 7
-  rectangle "==Apache Isis Sub - PDF Box (applib)\n<size:10>[Container: packaging: jar]</size>" <<10>> as 10
-  rectangle "==Apache Isis Sub - PDF Box (parent)\n<size:10>[Container: packaging: pom]</size>" <<9>> as 9
-  rectangle "==Apache Isis Sub - POI\n<size:10>[Container: packaging: pom]</size>" <<11>> as 11
-  rectangle "==Apache Isis Sub - Zip (applib)\n<size:10>[Container: packaging: jar]</size>" <<13>> as 13
-  rectangle "==Apache Isis Sub - Zip (parent)\n<size:10>[Container: packaging: pom]</size>" <<12>> as 12
-  rectangle "==Apache Isis Subdomains\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-}
-3 .[#707070].> 4 : ""
-5 .[#707070].> 6 : ""
-7 .[#707070].> 8 : ""
-9 .[#707070].> 10 : ""
-12 .[#707070].> 13 : ""
-2 .[#707070].> 3 : ""
-2 .[#707070].> 5 : ""
-2 .[#707070].> 7 : ""
-2 .[#707070].> 9 : ""
-2 .[#707070].> 11 : ""
-2 .[#707070].> 12 : ""
-@enduml
-----
-.Projects/Modules (Subdomains)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Subdomains
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains
-Type: pom
-Directory: /subdomains
-----
-|A library of domain services and of supporting subdomains (often technical in nature), to be called from the
-core domain of an Apache Isis applications.
-
-.Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
-
-|Apache Isis Sub - Docx (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-docx
-Type: pom
-Directory: /subdomains/docx
-----
-|Uses the Apache POI library for mail merge functions of .docx Word documents
-
-|Apache Isis Sub - Docx (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-docx-applib
-Type: jar
-Directory: /subdomains/docx/applib
-----
-|.Components
-****
-o.a.i.subdomains.docx.applib.service.DocxServiceDefault +
-****
-
-.Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.docx4j:docx4j-JAXB-ReferenceImpl:jar:<managed> +
-org.docx4j:docx4j-export-fo:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:subdomains:index/docx/applib/DocxService.adoc[DocxService], xref:refguide:subdomains:index/docx/applib/DocxService~MergeParams.adoc[DocxService.MergeParams]
-****
-
-|Apache Isis Sub - Freemarker (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-freemarker
-Type: pom
-Directory: /subdomains/freemarker
-----
-|Integrates Freemarker Library
-
-|Apache Isis Sub - Freemarker (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-freemarker-applib
-Type: jar
-Directory: /subdomains/freemarker/applib
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
-|Apache Isis Sub - Ognl (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-ognl
-Type: pom
-Directory: /subdomains/ognl
-----
-|Integrates Ognl Library
-
-|Apache Isis Sub - Ognl (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-ognl-applib
-Type: jar
-Directory: /subdomains/ognl/applib
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
-|Apache Isis Sub - PDF Box (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-pdfbox
-Type: pom
-Directory: /subdomains/pdfbox
-----
-|Integrates PDF Box Library
-
-|Apache Isis Sub - PDF Box (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-pdfbox-applib
-Type: jar
-Directory: /subdomains/pdfbox/applib
-----
-|Integrates PDF Box Library
-
-.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
-|Apache Isis Sub - POI
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-poi
-Type: pom
-Directory: /subdomains/poi
-----
-|Apache POI dependencies
-
-.Dependencies
-****
-org.apache.poi:poi-ooxml:jar:<managed> +
-org.apache.poi:poi-ooxml-lite:jar:<managed> +
-****
-
-|Apache Isis Sub - Zip (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-zip
-Type: pom
-Directory: /subdomains/zip
-----
-|A domain service for Apache Isis', for zipping utilities.
-
-|Apache Isis Sub - Zip (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-zip-applib
-Type: jar
-Directory: /subdomains/zip/applib
-----
-|.Components
-****
-o.a.i.subdomains.zip.applib.service.ZipServiceDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-|===
-
-=== Base
-
-[plantuml,Base,svg]
-----
-@startuml(id=Base)
-title Base - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Base\n[Software System]" {
-  rectangle "==Apache Isis Sub - Base (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Sub - Base (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-}
-2 .[#707070].> 3 : ""
-@enduml
-----
-.Projects/Modules (Base)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Sub - Base (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-base
-Type: pom
-Directory: /subdomains/base
-----
-|A module providing Base utilities for other subdomain modules
-
-|Apache Isis Sub - Base (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-base-applib
-Type: jar
-Directory: /subdomains/base/applib
-----
-|.Components
-****
-o.a.i.subdomains.base.applib.services.calendar.CalendarServiceDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained], xref:refguide:subdomains:index/base/applib/Dflt.adoc[Dflt], xref:refguide:subdomains:index/base/applib/IsisModuleSubdomainsBaseApplib.adoc[IsisModuleSubdomainsBaseApplib], xref:refguide:subdomains:index/base/applib/PowerType.adoc[PowerType], xref:refguide:subdomains:index/base/applib/Titled.adoc[Titled], xref:refguide:subdomains:index/base/applib/TitledEnum.adoc[TitledEnum], xref:refguide:subdomains:index/base/applib/servi [...]
-****
-|===
-
-=== Excel
-
-[plantuml,Excel,svg]
-----
-@startuml(id=Excel)
-title Excel - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<4>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<5>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<6>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Excel\n[Software System]" {
-  rectangle "==Apache Isis Sub - Excel (Fixtures)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Sub - Excel (Integ Tests)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
-  rectangle "==Apache Isis Sub - Excel (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Sub - Excel (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-  rectangle "==Apache Isis Sub - Excel (testing support)\n<size:10>[Container: packaging: jar]</size>" <<6>> as 6
-}
-2 .[#707070].> 4 : ""
-2 .[#707070].> 5 : ""
-2 .[#707070].> 3 : ""
-2 .[#707070].> 6 : ""
-@enduml
-----
-.Projects/Modules (Excel)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Sub - Excel (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-excel
-Type: pom
-Directory: /subdomains/excel
-----
-|A domain service for Apache Isis', allowing collections
-of (view model) objects to be exported/imported to/from an
-Excel spreadsheet.  Also support for excel-based fixtures.
-
-|Apache Isis Sub - Excel (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-excel-applib
-Type: jar
-Directory: /subdomains/excel/applib
-----
-|.Components
-****
-o.a.i.subdomains.excel.applib.service.ExcelServiceDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-poi:pom:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:subdomains:index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc[IsisModuleSubdomainsExcelApplib], xref:refguide:subdomains:index/excel/applib/dom/AggregationType.adoc[AggregationType], xref:refguide:subdomains:index/excel/applib/dom/ExcelMetaDataEnabled.adoc[ExcelMetaDataEnabled], xref:refguide:subdomains:index/excel/applib/dom/ExcelService.adoc[ExcelService], xref:refguide:subdomains:index/excel/applib/dom/HyperLink.adoc[HyperLink], xref:refguide:subdomains:index/excel/ [...]
-****
-
-|Apache Isis Sub - Excel (Fixtures)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-excel-fixtures
-Type: jar
-Directory: /subdomains/excel/fixture
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-testing:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-
-|Apache Isis Sub - Excel (Integ Tests)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-excel-integtests
-Type: jar
-Directory: /subdomains/excel/integtests
-----
-|.Dependencies
-****
-org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-fixtures:jar:<managed> +
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.hsqldb:hsqldb:jar:<managed> +
-****
-
-|Apache Isis Sub - Excel (testing support)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-excel-testing
-Type: jar
-Directory: /subdomains/excel/testing
-----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-
-.Document Index Entries
-****
-xref:refguide:subdomains:index/excel/testing/ExcelFixture.adoc[ExcelFixture], xref:refguide:subdomains:index/excel/testing/ExcelFixture2.adoc[ExcelFixture2], xref:refguide:subdomains:index/excel/testing/ExcelFixtureRowHandler.adoc[ExcelFixtureRowHandler], xref:refguide:subdomains:index/excel/testing/ExcelFixtureWorkbookHandler.adoc[ExcelFixtureWorkbookHandler], xref:refguide:subdomains:index/excel/testing/FixtureAwareRowHandler.adoc[FixtureAwareRowHandler], xref:refguide:subdomains:index [...]
-****
-|===
-
-=== Spring
-
-[plantuml,Spring,svg]
-----
-@startuml(id=Spring)
-title Spring - Containers
-caption Artifact Hierarchy (Maven)
-
-skinparam {
-  shadowing false
-  arrowFontSize 10
-  defaultTextAlignment center
-  wrapWidth 200
-  maxMessageSize 100
-}
-hide stereotype
-left to right direction
-skinparam rectangle<<2>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-skinparam rectangle<<3>> {
-  BackgroundColor #438dd5
-  FontColor #fffffe
-  BorderColor #2E6295
-}
-package "Spring\n[Software System]" {
-  rectangle "==Apache Isis Sub - Spring (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Sub - Spring (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-}
-2 .[#707070].> 3 : ""
-@enduml
-----
-.Projects/Modules (Spring)
-[cols="3a,5a", options="header"]
-|===
-|Coordinates |Description 
-
-|Apache Isis Sub - Spring (parent)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-spring
-Type: pom
-Directory: /subdomains/spring
-----
-|Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)
-
-|Apache Isis Sub - Spring (applib)
-[source,yaml]
-----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-spring-applib
-Type: jar
-Directory: /subdomains/spring/applib
-----
-|.Components
-****
-o.a.i.subdomains.spring.applib.service.SpringBeansService +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-command-log-applib:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-quartz-impl:jar:<managed> +
+org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-restfulobjects-client:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-restfulobjects-jaxrsresteasy4:jar:<managed> +
+org.glassfish.jersey.ext:jersey-spring5:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:subdomains:index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc[IsisModuleSubdomainsSpringApplib], xref:refguide:subdomains:index/spring/applib/service/BeanDescriptor.adoc[BeanDescriptor], xref:refguide:subdomains:index/spring/applib/service/ContextBeans.adoc[ContextBeans], xref:refguide:subdomains:index/spring/applib/service/SpringBeansService.adoc[SpringBeansService]
+xref:refguide:extensions:index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc[IsisModuleExtCommandReplaySecondary], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc[CommandReplayAnalyser], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc[CommandReplayAnalyserException], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc[CommandReplay [...]
 ****
 |===
 
-=== XDocReport
+=== Core: Quartz
 
-[plantuml,XDocReport,svg]
+[plantuml,Core: Quartz,svg]
 ----
-@startuml(id=XDocReport)
-title XDocReport - Containers
+@startuml(id=Core:_Quartz)
+title Core: Quartz - Containers
 caption Artifact Hierarchy (Maven)
 
 skinparam {
@@ -5775,58 +5111,61 @@ skinparam rectangle<<3>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-package "XDocReport\n[Software System]" {
-  rectangle "==Apache Isis Sub - XdocReport (applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Sub - XdocReport (parent)\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+package "Core: Quartz\n[Software System]" {
+  rectangle "==Apache Isis Ext - Quartz\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+  rectangle "==Apache Isis Ext - Quartz Impl\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
 }
 2 .[#707070].> 3 : ""
 @enduml
 ----
-.Projects/Modules (XDocReport)
+.Projects/Modules (Core: Quartz)
 [cols="3a,5a", options="header"]
 |===
 |Coordinates |Description 
 
-|Apache Isis Sub - XdocReport (parent)
+|Apache Isis Ext - Quartz
 [source,yaml]
 ----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-xdocreport
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-quartz
 Type: pom
-Directory: /subdomains/xdocreport
+Directory: /extensions/core/quartz
 ----
-|Integrates XDoc Report Library
+|Integrates Quartz
 
-|Apache Isis Sub - XdocReport (applib)
+|Apache Isis Ext - Quartz Impl
 [source,yaml]
 ----
-Group: org.apache.isis.subdomains
-Artifact: isis-subdomains-xdocreport-applib
+Group: org.apache.isis.extensions
+Artifact: isis-extensions-quartz-impl
 Type: jar
-Directory: /subdomains/xdocreport/applib
+Directory: /extensions/core/quartz/impl
 ----
-|.Components
-****
-o.a.i.subdomains.xdocreport.applib.service.XDocReportServiceDefault +
-****
-
-.Dependencies
+|.Dependencies
 ****
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.converter.docx.xwpf:jar:<managed> +
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.document.docx:jar:<managed> +
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.template.freemarker:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-poi:pom:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
+org.apache.isis.core:isis-core-config:jar:<managed> +
+org.apache.isis.core:isis-core-security:jar:<managed> +
+org.springframework.boot:spring-boot-starter-quartz:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:subdomains:index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc[IsisModuleSubdomainsXDocReportApplib], xref:refguide:subdomains:index/xdocreport/applib/XDocReportService.adoc[XDocReportService], xref:refguide:subdomains:index/xdocreport/applib/XDocReportService~XDocReportModel.adoc[XDocReportService.XDocReportModel]
+xref:refguide:extensions:index/quartz/IsisModuleExtQuartzImpl.adoc[IsisModuleExtQuartzImpl], xref:refguide:extensions:index/quartz/context/JobExecutionData.adoc[JobExecutionData], xref:refguide:extensions:index/quartz/spring/AutowiringSpringBeanJobFactory.adoc[AutowiringSpringBeanJobFactory]
 ****
 |===
 
+=== Security: Secman
+
+=== Security: Shiro LDAP Realm
+
+=== RO Viewer: CORS
+
+=== Wicket Viewer: Excel Download
+
+=== Wicket Viewer: Full Calendar
+
+=== Wicket Viewer: Pdf.js
+
 == Tooling
 
 [plantuml,Tooling,svg]
@@ -5922,7 +5261,7 @@ eg. code mining, automated documentation.
 
 .Dependencies
 ****
-org.checkerframework:checker-qual:jar:3.21.3 +
+org.checkerframework:checker-qual:jar:3.21.4 +
 org.junit.jupiter:junit-jupiter-api:jar:<managed> +
 org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
 org.junit.vintage:junit-vintage-engine:jar:<managed> +
@@ -6266,7 +5605,6 @@ org.apache.isis.extensions:isis-extensions-fullcalendar-applib:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-restclient-applib:jar:<managed> +
 org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
@@ -6275,6 +5613,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 org.apache.isis.valuetypes:isis-valuetypes-asciidoc-metamodel:jar:<managed> +
 org.apache.isis.valuetypes:isis-valuetypes-markdown-metamodel:jar:<managed> +
 org.apache.isis.valuetypes:isis-valuetypes-sse-metamodel:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-restfulobjects-client:jar:<managed> +
 ****
 
 |Apache Isis - Regression Tests (stable) - Bootstrapping
@@ -6426,11 +5765,11 @@ Directory: /regressiontests/stable-rest
 |.Dependencies
 ****
 org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-restclient-applib:jar:<managed> +
 org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
 org.apache.isis.regressiontests:isis-regressiontests-stable:jar:<managed> +
 org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-restfulobjects-client:jar:<managed> +
 ****
 
 |Apache Isis - Regression Tests (stable) - Value Types
@@ -6533,7 +5872,7 @@ Artifact: isis-incubator
 Type: pom
 Directory: /incubator
 ----
-|Collection of Apache Isis extensions, subdomains or BC mappings, currently incubating.
+|Collection of Apache Isis artifacts, currently incubating.
 
 .Dependencies
 ****
@@ -6584,12 +5923,12 @@ Directory: /incubator/clients/kroviz
 |Web client based on RESTful API
 |===
 
-=== JavaFX Viewer
+=== GraphQL Viewer
 
-[plantuml,JavaFX Viewer,svg]
+[plantuml,GraphQL Viewer,svg]
 ----
-@startuml(id=JavaFX_Viewer)
-title JavaFX Viewer - Containers
+@startuml(id=GraphQL_Viewer)
+title GraphQL Viewer - Containers
 caption Artifact Hierarchy (Maven)
 
 skinparam {
@@ -6621,99 +5960,94 @@ skinparam rectangle<<5>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-package "JavaFX Viewer\n[Software System]" {
-  rectangle "==Apache Isis Inc - Viewer JavaFX\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
-  rectangle "==Apache Isis Inc - Viewer JavaFX (Model)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
-  rectangle "==Apache Isis Inc - Viewer JavaFX (UI Components)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
-  rectangle "==Apache Isis Inc - Viewer JavaFX (Viewer)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+package "GraphQL Viewer\n[Software System]" {
+  rectangle "==Apache Isis Inc - Viewer GraphQL\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+  rectangle "==Apache Isis Inc - Viewer GraphQL (Applib)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
+  rectangle "==Apache Isis Inc - Viewer GraphQL (Model)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
+  rectangle "==Apache Isis Inc - Viewer GraphQL (Viewer)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
 }
 2 .[#707070].> 3 : ""
 2 .[#707070].> 4 : ""
 2 .[#707070].> 5 : ""
 @enduml
 ----
-.Projects/Modules (JavaFX Viewer)
+.Projects/Modules (GraphQL Viewer)
 [cols="3a,5a", options="header"]
 |===
 |Coordinates |Description 
 
-|Apache Isis Inc - Viewer JavaFX
+|Apache Isis Inc - Viewer GraphQL
 [source,yaml]
 ----
 Group: org.apache.isis.incubator.viewer
-Artifact: isis-viewer-javafx
+Artifact: isis-viewer-graphql
 Type: pom
-Directory: /incubator/viewers/javafx
+Directory: /incubator/viewers/graphql
 ----
-|Initial sketches
+|
 
-|Apache Isis Inc - Viewer JavaFX (Model)
+|Apache Isis Inc - Viewer GraphQL (Applib)
 [source,yaml]
 ----
 Group: org.apache.isis.incubator.viewer
-Artifact: isis-viewer-javafx-model
+Artifact: isis-viewer-graphql-applib
 Type: jar
-Directory: /incubator/viewers/javafx/model
+Directory: /incubator/viewers/graphql/applib
 ----
 |.Dependencies
 ****
+org.apache.isis.core:isis-applib:jar:<managed> +
 org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-org.openjfx:javafx-base:jar:<managed> +
-org.openjfx:javafx-controls:jar:<managed> +
-org.openjfx:javafx-fxml:jar:<managed> +
-org.openjfx:javafx-swing:jar:<managed> +
-org.openjfx:javafx-web:jar:<managed> +
 ****
 
-|Apache Isis Inc - Viewer JavaFX (UI Components)
+|Apache Isis Inc - Viewer GraphQL (Model)
 [source,yaml]
 ----
 Group: org.apache.isis.incubator.viewer
-Artifact: isis-viewer-javafx-ui
+Artifact: isis-viewer-graphql-model
 Type: jar
-Directory: /incubator/viewers/javafx/ui
+Directory: /incubator/viewers/graphql/model
 ----
-|.Components
-****
-o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx +
-o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton +
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider +
-o.a.i.incubator.viewer.javafx.ui.main.MainViewFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault +
-****
-
-.Dependencies
+|.Dependencies
 ****
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed> +
+org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
+org.apache.isis.incubator.viewer:isis-viewer-graphql-applib:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
+org.springframework.graphql:spring-graphql:jar:<managed> +
 ****
 
-|Apache Isis Inc - Viewer JavaFX (Viewer)
+|Apache Isis Inc - Viewer GraphQL (Viewer)
 [source,yaml]
 ----
 Group: org.apache.isis.incubator.viewer
-Artifact: isis-viewer-javafx-viewer
+Artifact: isis-viewer-graphql-viewer
 Type: jar
-Directory: /incubator/viewers/javafx/viewer
+Directory: /incubator/viewers/graphql/viewer
 ----
-|.Dependencies
+|.Components
 ****
-org.apache.isis.incubator.viewer:isis-viewer-javafx-ui:jar:<managed> +
+o.a.i.viewer.graphql.viewer.source.ExecutionStrategyResolvingWithinInteraction +
+o.a.i.viewer.graphql.viewer.source.GraphQlServiceForIsis +
+o.a.i.viewer.graphql.viewer.source.GraphQlSourceForIsis +
+o.a.i.viewer.graphql.viewer.source.ObjectTypeFactory +
+o.a.i.viewer.graphql.viewer.source.QueryFieldFactory +
+****
+
+.Dependencies
+****
+com.approvaltests:approvaltests:jar:<managed> +
+com.h2database:h2:jar:<managed> +
+org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
+org.apache.isis.core:isis-core-webapp:jar:<managed> +
+org.apache.isis.incubator.viewer:isis-viewer-graphql-model:jar:<managed> +
+org.apache.isis.mavendeps:isis-mavendeps-unittests:pom:<managed> +
+org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
+org.apache.isis.security:isis-security-bypass:jar:<managed> +
+org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
+org.assertj:assertj-core:jar:<managed> +
+org.mockito:mockito-core:jar:<managed> +
+org.springframework:spring-test:jar:<managed> +
+org.springframework.boot:spring-boot-starter-websocket:jar:<managed> +
 ****
 |===
 
@@ -6853,3 +6187,136 @@ org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:<managed> +
 org.springframework.boot:spring-boot-starter-web:jar:<managed> +
 ****
 |===
+
+=== JavaFX Viewer
+
+[plantuml,JavaFX Viewer,svg]
+----
+@startuml(id=JavaFX_Viewer)
+title JavaFX Viewer - Containers
+caption Artifact Hierarchy (Maven)
+
+skinparam {
+  shadowing false
+  arrowFontSize 10
+  defaultTextAlignment center
+  wrapWidth 200
+  maxMessageSize 100
+}
+hide stereotype
+left to right direction
+skinparam rectangle<<2>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<3>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<4>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+skinparam rectangle<<5>> {
+  BackgroundColor #438dd5
+  FontColor #fffffe
+  BorderColor #2E6295
+}
+package "JavaFX Viewer\n[Software System]" {
+  rectangle "==Apache Isis Inc - Viewer JavaFX\n<size:10>[Container: packaging: pom]</size>" <<2>> as 2
+  rectangle "==Apache Isis Inc - Viewer JavaFX (Model)\n<size:10>[Container: packaging: jar]</size>" <<3>> as 3
+  rectangle "==Apache Isis Inc - Viewer JavaFX (UI Components)\n<size:10>[Container: packaging: jar]</size>" <<4>> as 4
+  rectangle "==Apache Isis Inc - Viewer JavaFX (Viewer)\n<size:10>[Container: packaging: jar]</size>" <<5>> as 5
+}
+2 .[#707070].> 3 : ""
+2 .[#707070].> 4 : ""
+2 .[#707070].> 5 : ""
+@enduml
+----
+.Projects/Modules (JavaFX Viewer)
+[cols="3a,5a", options="header"]
+|===
+|Coordinates |Description 
+
+|Apache Isis Inc - Viewer JavaFX
+[source,yaml]
+----
+Group: org.apache.isis.incubator.viewer
+Artifact: isis-viewer-javafx
+Type: pom
+Directory: /incubator/viewers/javafx
+----
+|Initial sketches
+
+|Apache Isis Inc - Viewer JavaFX (Model)
+[source,yaml]
+----
+Group: org.apache.isis.incubator.viewer
+Artifact: isis-viewer-javafx-model
+Type: jar
+Directory: /incubator/viewers/javafx/model
+----
+|.Dependencies
+****
+org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
+org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
+org.openjfx:javafx-base:jar:<managed> +
+org.openjfx:javafx-controls:jar:<managed> +
+org.openjfx:javafx-fxml:jar:<managed> +
+org.openjfx:javafx-swing:jar:<managed> +
+org.openjfx:javafx-web:jar:<managed> +
+****
+
+|Apache Isis Inc - Viewer JavaFX (UI Components)
+[source,yaml]
+----
+Group: org.apache.isis.incubator.viewer
+Artifact: isis-viewer-javafx-ui
+Type: jar
+Directory: /incubator/viewers/javafx/ui
+----
+|.Components
+****
+o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx +
+o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton +
+o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider +
+o.a.i.incubator.viewer.javafx.ui.main.MainViewFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault +
+****
+
+.Dependencies
+****
+org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
+org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed> +
+****
+
+|Apache Isis Inc - Viewer JavaFX (Viewer)
+[source,yaml]
+----
+Group: org.apache.isis.incubator.viewer
+Artifact: isis-viewer-javafx-viewer
+Type: jar
+Directory: /incubator/viewers/javafx/viewer
+----
+|.Dependencies
+****
+org.apache.isis.incubator.viewer:isis-viewer-javafx-ui:jar:<managed> +
+****
+|===