You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/07 20:08:40 UTC

[isis] branch master updated (ad7c717 -> 9495f6f)

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

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


    from ad7c717  Merge pull request #170 from ahus1/ISIS-2258-asciidoc-comments-and-suggestions
     new f628db0  ISIS-2062; tiny improvement to preview.sh
     new 474377c  ISIS-2259: wip - splits out 'extensions' into 'mappings', 'subdomains', 'testing' as well as 'extensions'
     new cad702b  ISIS-2259: fixes compile issues.
     new 88dd55c  ISIS-2259; fixes up antora .yml files etc.
     new 9495f6f  ISIS-2259: further fix up of antora

The 5 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:
 .../modules/ROOT/partials/component-nav.adoc       |  22 +--
 antora/components/mappings/antora.yml              |   6 +
 .../mappings/modules/ROOT}/_attributes.adoc        |   0
 antora/components/mappings/modules/ROOT/nav.adoc   |   1 +
 .../mappings/modules/ROOT/pages}/_attributes.adoc  |   0
 .../mappings/modules/ROOT}/pages/about.adoc        |   4 +-
 .../modules/ROOT/partials}/_attributes.adoc        |   0
 .../modules/ROOT/partials/component-nav.adoc       |   6 +
 .../modules/ROOT/partials/module-nav.adoc          |   0
 .../modules/ROOT/partials/component-nav.adoc       |   3 -
 antora/components/subdomains/antora.yml            |   6 +
 .../subdomains/modules/ROOT}/_attributes.adoc      |   0
 antora/components/subdomains/modules/ROOT/nav.adoc |   1 +
 .../modules/ROOT/pages}/_attributes.adoc           |   0
 .../subdomains/modules/ROOT}/pages/about.adoc      |   4 +-
 .../modules/ROOT/partials}/_attributes.adoc        |   0
 .../modules/ROOT/partials/component-nav.adoc       |  12 ++
 .../modules/ROOT/partials/module-nav.adoc          |   0
 .../components/toc/modules/ROOT/pages/about.adoc   |   8 +-
 .../{extensions-catalog.adoc => catalogs.adoc}     |  26 ++-
 .../toc/modules/ROOT/partials/module-nav.adoc      |   9 +-
 antora/components/valuetypes/antora.yml            |   6 +
 .../valuetypes/modules/ROOT}/_attributes.adoc      |   0
 antora/components/valuetypes/modules/ROOT/nav.adoc |   1 +
 .../modules/ROOT/pages}/_attributes.adoc           |   0
 .../valuetypes/modules/ROOT}/pages/about.adoc      |   4 +-
 .../modules/ROOT/partials}/_attributes.adoc        |   0
 .../modules/ROOT/partials/component-nav.adoc       |   2 +
 .../modules/ROOT/partials/module-nav.adoc          |   0
 antora/supplemental-ui/index.html                  |   2 +-
 core-parent/pom.xml                                |   6 +-
 .../doc/modules/ROOT/partials/component-nav.adoc   |   1 -
 examples/smoketests/pom.xml                        |   8 +-
 .../testdomain/conf/Configuration_headless.java    |   2 +-
 extensions/core/spring/src/main/doc/antora.yml     |   2 -
 .../doc/modules/spring/partials/module-nav.adoc    |   3 -
 extensions/lib/base/impl/src/main/doc/antora.yml   |   2 -
 .../main/doc/modules/base/partials/module-nav.adoc |   3 -
 extensions/lib/docx/impl/src/main/doc/antora.yml   |   2 -
 .../main/doc/modules/docx/partials/module-nav.adoc |   3 -
 extensions/lib/excel/impl/src/main/doc/antora.yml  |   2 -
 .../doc/modules/excel/partials/module-nav.adoc     |   3 -
 .../lib/freemarker/impl/src/main/doc/antora.yml    |   2 -
 .../modules/freemarker/partials/module-nav.adoc    |   3 -
 extensions/lib/jaxrsclient/impl/pom.xml            |  37 ----
 .../lib/jaxrsclient/impl/src/main/doc/antora.yml   |   2 -
 .../modules/jaxrsclient/partials/module-nav.adoc   |   3 -
 .../jaxrsclient/dom/IsisModuleExtJaxRsClient.java  |  28 ---
 extensions/lib/minio/impl/src/main/doc/antora.yml  |   2 -
 .../doc/modules/minio/partials/module-nav.adoc     |   3 -
 extensions/lib/ognl/impl/src/main/doc/antora.yml   |   2 -
 .../main/doc/modules/ognl/partials/module-nav.adoc |   3 -
 extensions/lib/pdfbox/impl/src/main/doc/antora.yml |   2 -
 .../doc/modules/pdfbox/partials/module-nav.adoc    |   3 -
 extensions/lib/slack/impl/src/main/doc/antora.yml  |   2 -
 .../doc/modules/slack/partials/module-nav.adoc     |   3 -
 .../lib/xdocreport/impl/src/main/doc/antora.yml    |   2 -
 .../modules/xdocreport/partials/module-nav.adoc    |   3 -
 extensions/lib/zip/impl/src/main/doc/antora.yml    |   2 -
 .../main/doc/modules/zip/partials/module-nav.adoc  |   3 -
 .../flywayjdo/impl/src/main/doc/antora.yml         |   2 +-
 .../doc/modules/flywayjdo/partials/module-nav.adoc |   2 +-
 .../doc/modules/h2console/partials/module-nav.adoc |   2 +-
 .../doc/modules/hsqldbmgr/partials/module-nav.adoc |   2 +-
 extensions/pom.xml                                 | 127 +------------
 extensions/security/secman/persistence-jdo/pom.xml |   4 +-
 .../shiro-realm-ldap/src/main/doc/antora.yml       |   2 +-
 .../doc/modules/shiro-realm-ldap/pages/about.adoc  |   8 +-
 .../shiro-realm-ldap/partials/module-nav.adoc      |   2 +-
 extensions/vro/cors/src/main/doc/antora.yml        |   2 +-
 extensions/vro/restclient/src/main/doc/antora.yml  |   2 -
 .../modules/restclient/partials/module-nav.adoc    |   4 -
 extensions/vw/asciidoc/src/main/doc/antora.yml     |   2 -
 .../vw/exceldownload/src/main/doc/antora.yml       |   2 +-
 extensions/vw/markdown/src/main/doc/antora.yml     |   2 -
 .../vw/servletapi/impl/src/main/doc/antora.yml     |   2 -
 extensions/vw/sse/src/main/doc/antora.yml          |   2 -
 .../modules/microprofile/partials/module-nav.adoc  |   4 -
 incubator/{ => extensions}/core/jsr303/README.adoc |   0
 incubator/{ => extensions}/core/jsr303/pom.xml     |   0
 .../examples/facets/jsr303/Jsr303FacetFactory.java |   0
 .../facets/jsr303/Jsr303ProgModelFacets.java       |   0
 .../jsr303/Jsr303PropertyValidationFacet.java      |   0
 .../examples/facets/jsr303/CustomPattern.java      |   0
 .../facets/jsr303/CustomPatternValidator.java      |   0
 .../examples/facets/jsr303/CustomPatterns.java     |   0
 .../facets/jsr303/DomainObjectVanilla.java         |   0
 .../jsr303/DomainObjectWithBuiltInValidation.java  |   0
 .../jsr303/DomainObjectWithCustomValidation.java   |   0
 .../facets/jsr303/Jsr303FacetFacetHolder.java      |   0
 .../jsr303/Jsr303FacetFactoryFeatureTypes.java     |   0
 .../jsr303/Jsr303FacetFactoryInstantiation.java    |   0
 .../jsr303/Jsr303FacetFactoryProcessObject.java    |   0
 .../jsr303/Jsr303FacetFactoryProcessProperty.java  |   0
 .../facets/jsr303/Jsr303FacetInstantiation.java    |   0
 .../jsr303/Jsr303FacetValidatingInteraction.java   |   0
 .../{ => extensions}/core/microprofile/pom.xml     |   2 +-
 .../core/microprofile}/src/main/doc/antora.yml     |   0
 .../doc/modules/microprofile}/_attributes.adoc     |   0
 .../src/main/doc/modules/microprofile}/nav.adoc    |   0
 .../modules/microprofile/pages}/_attributes.adoc   |   0
 .../main/doc/modules/microprofile/pages/about.adoc |   0
 .../microprofile/partials}/_attributes.adoc        |   0
 .../modules/microprofile/partials/module-nav.adoc  |   4 +
 .../jee_support/IsisCDIBeanScanInterceptor.java    |   0
 .../services/javax.enterprise.inject.spi.Extension |   0
 incubator/{ => extensions}/core/model/pom.xml      |   2 +-
 .../core/model}/src/main/doc/antora.yml            |   0
 .../src/main/doc/modules/model}/_attributes.adoc   |   0
 .../model/src/main/doc/modules/model}/nav.adoc     |   0
 .../main/doc/modules/model/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/model/pages/about.adoc    |   0
 .../doc/modules/model/partials}/_attributes.adoc   |   0
 .../doc/modules/model/partials/module-nav.adoc     |   0
 .../model/applib/IsisModuleIncModelApplib.java     |   0
 .../incubator/model/applib/annotation/Model.java   |   0
 .../metamodel/IsisModuleIncModelMetaModel.java     |   0
 .../SupportingMethodValidatorRefinerFactory.java   |   0
 .../services/IncubatorMetaModelPlugin.java         |   0
 incubator/pom.xml                                  |  14 +-
 .../runtime => extensions/core/applib}/.gitignore  |   0
 legacy/{ => extensions}/core/applib/pom.xml        |   2 +-
 .../core/applib}/src/main/doc/antora.yml           |   0
 .../src/main/doc/modules/applib}/_attributes.adoc  |   0
 .../applib/src/main/doc/modules/applib}/nav.adoc   |   0
 .../doc/modules/applib/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/applib/pages/about.adoc   |   0
 .../doc/modules/applib/partials}/_attributes.adoc  |   0
 .../doc/modules/applib/partials/module-nav.adoc    |   0
 .../isis/legacy/applib/DomainObjectContainer.java  |   0
 .../apache/isis/legacy/applib/filter/Filter.java   |   0
 .../apache/isis/legacy/applib/filter/Filters.java  |   0
 .../background/BackgroundCommandService2.java      |   0
 .../services/background/BackgroundService.java     |   0
 .../services/background/BackgroundService2.java    |   0
 .../services/eventbus/ActionDomainEvent.java       |   0
 .../services/eventbus/CollectionDomainEvent.java   |   0
 .../services/eventbus/PropertyDomainEvent.java     |   0
 .../org/apache/isis/legacy/applib/value/Color.java |   0
 .../apache/isis/legacy/applib/value/Magnitude.java |   0
 .../org/apache/isis/legacy/applib/value/Money.java |   0
 .../isis/legacy/applib/value/Percentage.java       |   0
 .../apache/isis/legacy/applib/value/ColorTest.java |   0
 .../apache/isis/legacy/applib/value/MoneyTest.java |   0
 .../isis/legacy/applib/value/PercentageTest.java   |   0
 .../core/commons}/.gitignore                       |   0
 legacy/{ => extensions}/core/commons/pom.xml       |   2 +-
 .../core/commons}/src/main/doc/antora.yml          |   0
 .../src/main/doc/modules/commons}/_attributes.adoc |   0
 .../commons/src/main/doc/modules/commons}/nav.adoc |   0
 .../doc/modules/commons/pages}/_attributes.adoc    |   0
 .../src/main/doc/modules/commons/pages/about.adoc  |   0
 .../doc/modules/commons/partials}/_attributes.adoc |   0
 .../doc/modules/commons/partials/module-nav.adoc   |   0
 .../FutureWithIndexIntoFutureOfList.java           |   0
 .../threadpool/ThreadPoolExecutionMode.java        |   0
 .../internal/threadpool/ThreadPoolSizeAdvisor.java |   0
 .../internal/threadpool/ThreadPoolSupport.java     |   0
 .../internal/threadpool/ThreadPoolSupportTest.java |   0
 .../core/metamodel}/.gitignore                     |   0
 legacy/{ => extensions}/core/metamodel/pom.xml     |   2 +-
 .../facets/value/color/ColorValueFacet.java        |   0
 ...lorValueFacetUsingSemanticsProviderFactory.java |   0
 .../value/color/ColorValueSemanticsProvider.java   |   0
 .../facets/value/money/MoneyValueFacet.java        |   0
 ...neyValueFacetUsingSemanticsProviderFactory.java |   0
 .../value/money/MoneyValueSemanticsProvider.java   |   0
 ...ageValueFacetUsingSemanticsProviderFactory.java |   0
 .../PercentageValueSemanticsProvider.java          |   0
 .../value/ColorValueSemanticsProviderTest.java     |   0
 .../value/MoneyValueSemanticsProviderTest.java     |   0
 .../PercentageValueSemanticsProviderTest.java      |   0
 .../PolishMoneyValueSemanticsProviderTest.java     |   0
 .../applib => extensions/core/runtime}/.gitignore  |   0
 legacy/{ => extensions}/core/runtime/pom.xml       |   2 +-
 .../core/runtime}/src/main/doc/antora.yml          |   0
 .../src/main/doc/modules/runtime}/_attributes.adoc |   0
 .../runtime/src/main/doc/modules/runtime}/nav.adoc |   0
 .../doc/modules/runtime/pages}/_attributes.adoc    |   0
 .../src/main/doc/modules/runtime/pages/about.adoc  |   0
 .../doc/modules/runtime/partials}/_attributes.adoc |   0
 .../doc/modules/runtime/partials/module-nav.adoc   |   0
 .../datanucleus/valuetypes/IsisMoneyMapping.java   |   0
 .../legacy/runtime/snapshot/DomSerializer.java     |   0
 .../legacy/runtime/snapshot/DomSerializerJaxp.java |   0
 .../isis/legacy/runtime/sysout/SystemPrinter.java  |   0
 .../system/persistence/LoggingLocation.java        |   0
 .../runtime/system/persistence/ObjectFactory.java  |   0
 .../system/persistence/SuspendableListener.java    |   0
 .../viewer/web/AbstractServletOrFilterMapping.java |   0
 .../runtime/viewer/web/FilterSpecification.java    |   0
 .../runtime/viewer/web/ServletSpecification.java   |   0
 .../runtime/viewer/web/WebAppSpecification.java    |   0
 .../scalars/isisapplib/IsisColorPanel.java         |   0
 .../scalars/isisapplib/IsisColorPanelFactory.java  |   0
 .../scalars/isisapplib/IsisMoneyPanel.java         |   0
 .../scalars/isisapplib/IsisMoneyPanelFactory.java  |   0
 .../scalars/isisapplib/IsisPercentagePanel.java    |   0
 .../isisapplib/IsisPercentagePanelFactory.java     |   0
 legacy/{vro => mappings}/restclient/pom.xml        |   0
 .../restclient}/src/main/doc/antora.yml            |   0
 .../main/doc/modules/restclient}/_attributes.adoc  |   0
 .../src/main/doc/modules/restclient}/nav.adoc      |   0
 .../doc/modules/restclient/pages}/_attributes.adoc |   0
 .../main/doc/modules/restclient/pages/about.adoc   |   0
 .../modules/restclient/partials}/_attributes.adoc  |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../legacy/restclient/ClientRequestFactory.java    |   0
 .../legacy/restclient/RepresentationWalker.java    |   0
 .../isis/legacy/restclient/RestEasyLegacy.java     |   0
 .../isis/legacy/restclient/RestfulClient.java      |   0
 .../legacy/restclient/RestfulClientException.java  |   0
 .../isis/legacy/restclient/lib/ClientExecutor.java |   0
 .../isis/legacy/restclient/lib/ClientRequest.java  |   0
 .../restclient/lib/ClientRequestConfigurer.java    |   0
 .../restclient/lib/RestfulHttpMethodHelper.java    |   0
 .../lib/RestfulHttpMethodTest_setUp.java           |   0
 legacy/pom.xml                                     |  18 +-
 .../subdomains/servletapi}/impl/pom.xml            |  14 +-
 .../servletapi/impl}/src/main/doc/antora.yml       |   0
 .../main/doc/modules/servletapi}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/servletapi/nav.adoc  |   0
 .../doc/modules/servletapi/pages}/_attributes.adoc |   0
 .../main/doc/modules/servletapi/pages/about.adoc   |   0
 .../modules/servletapi/partials}/_attributes.adoc  |   0
 .../modules/servletapi/partials/module-nav.adoc    |   0
 .../servletapi/dom/IsisModuleSubServletApi.java    |   4 +-
 .../{testsupport => testing}/mavenplugin/pom.xml   |   0
 .../mavenplugin}/src/main/doc/antora.yml           |   0
 .../src/main/doc/modules/mvn}/_attributes.adoc     |   0
 .../src/main/doc/modules/mvn/attachments}/.gitkeep |   0
 .../src/main/doc/modules/mvn/examples}/.gitkeep    |   0
 .../modules/mvn/images/maven-plugin/xsd-goal.png   | Bin
 .../modules/mvn/images/maven-plugin/xsd-goal.pptx  | Bin
 .../mavenplugin/src/main/doc/modules/mvn/nav.adoc  |   0
 .../main/doc/modules/mvn/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/mvn/pages/about.adoc      |   0
 .../src/main/doc/modules/mvn/pages/intro.adoc      |   0
 .../src/main/doc/modules/mvn/pages/swagger.adoc    |   0
 .../src/main/doc/modules/mvn/pages/validate.adoc   |   0
 .../src/main/doc/modules/mvn/pages/xsd.adoc        |   0
 .../doc/modules/mvn/partials}/_attributes.adoc     |   0
 .../src/main/doc/modules/mvn/partials/nav.adoc     |   0
 .../apache/isis/mavenplugin/IsisMojoAbstract.java  |   0
 .../apache/isis/mavenplugin/IsisMojoSwagger.java   |   0
 .../apache/isis/mavenplugin/IsisMojoValidate.java  |   0
 .../org/apache/isis/mavenplugin/IsisMojoXsd.java   |   0
 .../isis/mavenplugin/MetaModelProcessor.java       |   0
 .../IsisMavenPlugin_SpringContextConfig.java       |   0
 .../IsisMavenPlugin_SpringContextLauncher.java     |   0
 .../jaxrsclient}/impl/pom.xml                      |  15 +-
 .../jaxrsclient}/impl/src/main/doc/antora.yml      |   2 +-
 .../main/doc/modules/jaxrsclient}/_attributes.adoc |   0
 .../src/main/doc/modules/jaxrsclient}/nav.adoc     |   0
 .../modules/jaxrsclient/pages}/_attributes.adoc    |   0
 .../main/doc/modules/jaxrsclient/pages/about.adoc  |   0
 .../modules/jaxrsclient/partials}/_attributes.adoc |   0
 .../modules/jaxrsclient/partials/module-nav.adoc   |   3 +
 .../jaxrsclient/dom/IsisModuleExtJaxRsClient.java  |   0
 {extensions/lib => mappings}/minio/impl/pom.xml    |  12 +-
 .../minio}/impl/src/main/doc/antora.yml            |   2 +-
 .../src/main/doc/modules/minio}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/minio}/nav.adoc      |   0
 .../main/doc/modules/minio/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/minio/pages/about.adoc    |   0
 .../doc/modules/minio/partials}/_attributes.adoc   |   0
 .../doc/modules/minio/partials/module-nav.adoc     |   3 +
 mappings/pom.xml                                   | 162 ++++++++++++++++
 .../restclient/impl}/pom.xml                       |  10 +-
 .../restclient}/impl/src/main/doc/antora.yml       |   2 +-
 .../main/doc/modules/restclient}/_attributes.adoc  |   0
 .../impl}/src/main/doc/modules/restclient/nav.adoc |   0
 .../doc/modules/restclient/pages}/_attributes.adoc |   0
 .../main/doc/modules/restclient/pages/about.adoc   |   0
 .../modules/restclient/partials}/_attributes.adoc  |   0
 .../modules/restclient/partials/module-nav.adoc    |   4 +
 .../restclient/ActionParameterListBuilder.java     |   0
 .../restclient/IsisModuleExtRestClient.java        |   0
 .../isis/extensions/restclient/ResponseDigest.java |   0
 .../isis/extensions/restclient/RestfulClient.java  |   0
 .../extensions/restclient/RestfulClientConfig.java |   0
 .../restclient/RestfulClientException.java         |   0
 .../isis/extensions/restclient/ScalarValueDto.java |   0
 .../restclient/auth/BasicAuthFilter.java           |   0
 .../restclient/log/RestfulLoggingFilter.java       |   0
 {extensions/lib => mappings}/slack/impl/pom.xml    |  12 +-
 .../slack}/impl/src/main/doc/antora.yml            |   2 +-
 .../src/main/doc/modules/slack}/_attributes.adoc   |   0
 .../slack/impl/src/main/doc/modules/slack/nav.adoc |   0
 .../main/doc/modules/slack/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/slack/pages/about.adoc    |   0
 .../doc/modules/slack/partials}/_attributes.adoc   |   0
 .../doc/modules/slack/partials/module-nav.adoc     |   3 +
 .../extensions/slack/dom/IsisModuleExtSlack.java   |   0
 preview.sh                                         |   2 +-
 site-extensions.yml                                |  35 +++-
 site-incubator.yml                                 |   4 +-
 site-legacy.yml                                    |  11 +-
 site-legacy.yml => site-mappings.yml               |  13 +-
 site-testing.yml => site-subdomains.yml            |  30 ++-
 site-testing.yml                                   |  13 +-
 site-incubator.yml => site-valuetypes.yml          |  11 +-
 site.yml                                           | 119 ++++++------
 starters/pom.xml                                   |  48 +++++
 {extensions/lib => subdomains}/base/impl/pom.xml   |  16 +-
 subdomains/base/impl/src/main/doc/antora.yml       |   2 +
 .../src/main/doc/modules/base}/_attributes.adoc    |   0
 .../base/impl/src/main/doc/modules/base}/nav.adoc  |   0
 .../main/doc/modules/base/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/base/pages/about.adoc     |   0
 .../doc/modules/base/partials}/_attributes.adoc    |   0
 .../main/doc/modules/base/partials/module-nav.adoc |   3 +
 .../apache/isis/extensions/base/dom/Chained.java   |   0
 .../org/apache/isis/extensions/base/dom/Dflt.java  |   0
 .../extensions/base/dom/IsisModuleExtBase.java     |   0
 .../apache/isis/extensions/base/dom/PowerType.java |   0
 .../apache/isis/extensions/base/dom/Titled.java    |   0
 .../isis/extensions/base/dom/TitledEnum.java       |   0
 .../base/dom/services/BaseServicesModule.java      |   0
 .../dom/services/calendar/CalendarService.java     |   0
 .../extensions/base/dom/types/DescriptionType.java |   0
 .../isis/extensions/base/dom/types/FqcnType.java   |   0
 .../isis/extensions/base/dom/types/MoneyType.java  |   0
 .../isis/extensions/base/dom/types/NameType.java   |   0
 .../isis/extensions/base/dom/types/NotesType.java  |   0
 .../base/dom/types/ObjectIdentifierType.java       |   0
 .../extensions/base/dom/types/PercentageType.java  |   0
 .../extensions/base/dom/types/ProperNameType.java  |   0
 .../extensions/base/dom/types/ReferenceType.java   |   0
 .../isis/extensions/base/dom/types/TitleType.java  |   0
 .../extensions/base/dom/types/UrlTemplateType.java |   0
 .../extensions/base/dom/types/UserNameType.java    |   0
 .../isis/extensions/base/dom/types/XxxType.java    |   0
 .../isis/extensions/base/dom/utils/ClassUtils.java |   0
 .../extensions/base/dom/utils/JodaPeriodUtils.java |   0
 .../isis/extensions/base/dom/utils/MathUtils.java  |   0
 .../extensions/base/dom/utils/MessageUtils.java    |   0
 .../extensions/base/dom/utils/StringUtils.java     |   0
 .../extensions/base/dom/utils/TitleBuilder.java    |   0
 .../base/dom/valuetypes/AbstractInterval.java      |   0
 .../base/dom/valuetypes/LocalDateInterval.java     |   0
 .../isis/extensions/base/dom/valuetypes/VT.java    |   0
 .../base/dom/with/WithCodeComparable.java          |   0
 .../extensions/base/dom/with/WithCodeGetter.java   |   0
 .../extensions/base/dom/with/WithCodeUnique.java   |   0
 .../base/dom/with/WithDescriptionComparable.java   |   0
 .../base/dom/with/WithDescriptionGetter.java       |   0
 .../base/dom/with/WithDescriptionUnique.java       |   0
 .../extensions/base/dom/with/WithInterval.java     |   0
 .../base/dom/with/WithIntervalContiguous.java      |   0
 .../base/dom/with/WithIntervalMutable.java         |   0
 .../base/dom/with/WithNameComparable.java          |   0
 .../extensions/base/dom/with/WithNameGetter.java   |   0
 .../extensions/base/dom/with/WithNameUnique.java   |   0
 .../base/dom/with/WithReferenceComparable.java     |   0
 .../base/dom/with/WithReferenceGetter.java         |   0
 .../base/dom/with/WithReferenceUnique.java         |   0
 .../extensions/base/dom/with/WithSequence.java     |   0
 .../extensions/base/dom/with/WithStartDate.java    |   0
 .../base/dom/with/WithTitleComparable.java         |   0
 .../extensions/base/dom/with/WithTitleGetter.java  |   0
 .../extensions/base/dom/with/WithTitleUnique.java  |   0
 .../dom/TitledEnumContractTestAbstract_title.java  |   0
 .../base/dom/TitledEnumContractTester.java         |   0
 .../extensions/base/dom/matchers/IsisMatchers.java |   0
 .../CalendarServiceTest_beginningOfMonth.java      |   0
 .../CalendarServiceTest_beginningOfQuarter.java    |   0
 .../base/dom/testing/PrivateConstructorTester.java |   0
 .../TitledEnumContractTestAbstract_title.java      |   0
 .../base/dom/titled/TitledEnumContractTester.java  |   0
 .../extensions/base/dom/utils/ClassUtilsTest.java  |   0
 .../base/dom/utils/JodaPeriodUtilsTest.java        |   0
 .../extensions/base/dom/utils/MathUtilsTest.java   |   0
 .../base/dom/utils/MessageUtils_Test.java          |   0
 .../extensions/base/dom/utils/StringUtilsTest.java |   0
 .../base/dom/utils/TitleBuilderTest.java           |   0
 .../base/dom/valuetypes/LocalDateIntervalTest.java |   0
 ...arableByCodeContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByCodeContractTester.java   |   0
 ...yDescriptionContractTestAbstract_compareTo.java |   0
 .../ComparableByDescriptionContractTester.java     |   0
 ...arableByNameContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByNameContractTester.java   |   0
 ...eByReferenceContractTestAbstract_compareTo.java |   0
 .../with/ComparableByReferenceContractTester.java  |   0
 ...rableByTitleContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByTitleContractTester.java  |   0
 .../dom/with/InstantiatorForComparableByCode.java  |   0
 .../InstantiatorForComparableByDescription.java    |   0
 .../dom/with/InstantiatorForComparableByName.java  |   0
 .../with/InstantiatorForComparableByReference.java |   0
 .../dom/with/InstantiatorForWithStartDate.java     |   0
 ...lperClassesContractTest_privateConstructor.java |   0
 .../WithFieldUniqueContractTestAllAbstract.java    |   0
 ...valMutableContractTestAbstract_changeDates.java |   0
 ...arableByCodeContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByCodeContractTester.java   |   0
 ...yDescriptionContractTestAbstract_compareTo.java |   0
 .../ComparableByDescriptionContractTester.java     |   0
 ...arableByNameContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByNameContractTester.java   |   0
 ...eByReferenceContractTestAbstract_compareTo.java |   0
 .../with/ComparableByReferenceContractTester.java  |   0
 ...rableByTitleContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByTitleContractTester.java  |   0
 .../dom/with/InstantiatorForComparableByCode.java  |   0
 .../InstantiatorForComparableByDescription.java    |   0
 .../dom/with/InstantiatorForComparableByName.java  |   0
 .../with/InstantiatorForComparableByReference.java |   0
 .../dom/with/InstantiatorForWithStartDate.java     |   0
 .../WithFieldUniqueContractTestAllAbstract.java    |   0
 ...valMutableContractTestAbstract_changeDates.java |   0
 {extensions/lib => subdomains}/docx/impl/pom.xml   |  14 +-
 subdomains/docx/impl/src/main/doc/antora.yml       |   2 +
 .../src/main/doc/modules/docx}/_attributes.adoc    |   0
 .../docx/impl/src/main/doc/modules/docx}/nav.adoc  |   0
 .../main/doc/modules/docx/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/docx/pages/about.adoc     |   0
 .../doc/modules/docx/partials}/_attributes.adoc    |   0
 .../main/doc/modules/docx/partials/module-nav.adoc |   3 +
 .../extensions/docx/dom/IsisModuleExtDocx.java     |   0
 .../excel}/fixture/.gitignore                      |   0
 .../excel}/fixture/logging-dn-enhance.properties   |   0
 .../lib => subdomains}/excel/fixture/pom.xml       |  26 +--
 .../fixture/src/main/java/META-INF/persistence.xml |   0
 .../excel/fixtures/ExcelFixturesModule.java        |   0
 .../contributions/ExcelDemoToDoItem_export.java    |   0
 .../contributions/ExcelDemoToDoItem_export2.java   |   0
 .../BulkUpdateLineItemForDemoToDoItem.java         |   0
 .../BulkUpdateLineItemForDemoToDoItem.layout.xml   |   0
 .../BulkUpdateManagerForDemoToDoItem.java          |   0
 .../BulkUpdateManagerForDemoToDoItem.layout.xml    |   0
 .../bulkupdate/BulkUpdateMenuForDemoToDoItem.java  |   0
 .../pivot/ExcelPivotByCategoryAndSubcategory.java  |   0
 .../ExcelPivotByCategoryAndSubcategoryMenu.java    |   0
 .../demotodoitem/DemoToDoItemRowHandler.java       |   0
 .../demotodoitem/DemoToDoItemRowHandler2.java      |   0
 .../ExcelUploadRowHandler4ToDoItem.java            |   0
 .../ExcelUploadServiceForDemoToDoItem.java         |   0
 .../DemoFixture_extending_ExcelFixture2.java       |   0
 .../DemoToDoItem_create_usingExcelFixture.java     |   0
 .../DemoToDoItem_recreate_usingExcelFixture.java   |   0
 .../demomodule/fixturescripts/MoreToDoItems.xlsx   | Bin
 .../demomodule/fixturescripts/ToDoItems.xlsx       | Bin
 .../fixtures/demoapp/todomodule/dom/Category.java  |   0
 .../todomodule/dom/DependenciesComparator.java     |   0
 .../todomodule/dom/ExcelDemoToDoItem-done.png      | Bin
 .../todomodule/dom/ExcelDemoToDoItem-todo.png      | Bin
 .../demoapp/todomodule/dom/ExcelDemoToDoItem.java  |   0
 .../todomodule/dom/ExcelDemoToDoItem.layout.xml    |   0
 .../demoapp/todomodule/dom/ExcelDemoToDoItem.png   | Bin
 .../todomodule/dom/ExcelDemoToDoItemMenu.java      |   0
 .../demoapp/todomodule/dom/Subcategory.java        |   0
 .../ExcelDemoToDoItem_recreate5_for.java           |   0
 .../ExcelDemoToDoItem_recreate5_forSven.java       |   0
 .../fixturescripts/ExcelDemoToDoItem_tearDown.java |   0
 .../ExcelDemoToDoItem_tearDown2.java               |   0
 {extensions/lib => subdomains}/excel/impl/pom.xml  |  18 +-
 subdomains/excel/impl/src/main/doc/antora.yml      |   2 +
 .../src/main/doc/modules/excel}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/excel}/nav.adoc      |   0
 .../main/doc/modules/excel/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/excel/pages/about.adoc    |   0
 .../doc/modules/excel/partials}/_attributes.adoc   |   0
 .../doc/modules/excel/partials/module-nav.adoc     |   3 +
 .../isis/extensions/excel/IsisModuleExtExcel.java  |   0
 .../isis/extensions/excel/dom/AggregationType.java |   0
 .../isis/extensions/excel/dom/ExcelFixture.java    |   0
 .../isis/extensions/excel/dom/ExcelFixture2.java   |   0
 .../excel/dom/ExcelFixtureRowHandler.java          |   0
 .../excel/dom/ExcelFixtureWorkbookHandler.java     |   0
 .../extensions/excel/dom/ExcelMetaDataEnabled.java |   0
 .../isis/extensions/excel/dom/ExcelService.java    |   0
 .../excel/dom/FixtureAwareRowHandler.java          |   0
 .../isis/extensions/excel/dom/HyperLink.java       |   0
 .../isis/extensions/excel/dom/PivotColumn.java     |   0
 .../isis/extensions/excel/dom/PivotDecoration.java |   0
 .../apache/isis/extensions/excel/dom/PivotRow.java |   0
 .../isis/extensions/excel/dom/PivotValue.java      |   0
 .../isis/extensions/excel/dom/RowHandler.java      |   0
 .../extensions/excel/dom/WorksheetContent.java     |   0
 .../isis/extensions/excel/dom/WorksheetSpec.java   |   0
 .../extensions/excel/dom/util/AnnotationList.java  |   0
 .../excel/dom/util/AnnotationTriplet.java          |   0
 .../extensions/excel/dom/util/CellMarshaller.java  |   0
 .../extensions/excel/dom/util/ExcelConverter.java  |   0
 .../excel/dom/util/ExcelFileBlobConverter.java     |   0
 .../excel/dom/util/ExcelServiceImpl.java           |   0
 .../isis/extensions/excel/dom/util/Mode.java       |   0
 .../isis/extensions/excel/dom/util/PivotUtils.java |   0
 .../extensions/excel/dom/util/SheetPivoter.java    |   0
 .../excel/dom/util/AnnotationListTest.java         |   0
 .../excel/dom/util/AnnotationTripletTest.java      |   0
 .../extensions/excel/dom/util/PivotUtilsTest.java  |   0
 .../excel/dom/util/SheetPivoterTest.java           |   0
 .../excel}/integtests/log4j2-test.xml              |   0
 .../lib => subdomains}/excel/integtests/pom.xml    |  26 +--
 .../integtests/ExcelModuleIntegTestAbstract.java   |   0
 .../ExcelModuleDemoMetaDataEnabled_IntegTest.java  |   0
 ...uleDemoToDoItemBulkUpdateManager_IntegTest.java |   0
 .../ExcelModuleDemoUploadService_IntegTest.java    |   0
 .../tests/ToDoItemsWithMultipleSheets.xlsx         | Bin
 .../excel/integtests/tests/toDoItems-expected.xlsx | Bin
 .../excel/integtests/tests/toDoItems-updated.xlsx  | Bin
 .../excel}/integtests/toDoItems-actual.xlsx        | Bin
 .../excel/integtests/translations.pot              |   0
 .../lib => subdomains}/freemarker/impl/pom.xml     |  12 +-
 subdomains/freemarker/impl/src/main/doc/antora.yml |   2 +
 .../main/doc/modules/freemarker}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/freemarker}/nav.adoc |   0
 .../doc/modules/freemarker/pages}/_attributes.adoc |   0
 .../main/doc/modules/freemarker/pages/about.adoc   |   0
 .../modules/freemarker/partials}/_attributes.adoc  |   0
 .../modules/freemarker/partials/module-nav.adoc    |   3 +
 .../freemarker/dom/IsisModuleExtFreemarker.java    |   0
 {extensions/lib => subdomains}/ognl/impl/pom.xml   |  12 +-
 subdomains/ognl/impl/src/main/doc/antora.yml       |   2 +
 .../src/main/doc/modules/ognl}/_attributes.adoc    |   0
 .../ognl/impl/src/main/doc/modules/ognl}/nav.adoc  |   0
 .../main/doc/modules/ognl/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/ognl/pages/about.adoc     |   0
 .../doc/modules/ognl/partials}/_attributes.adoc    |   0
 .../main/doc/modules/ognl/partials/module-nav.adoc |   3 +
 .../extensions/ognl/dom/IsisModuleExtOgnl.java     |   0
 {extensions/lib => subdomains}/pdfbox/impl/pom.xml |  12 +-
 subdomains/pdfbox/impl/src/main/doc/antora.yml     |   2 +
 .../src/main/doc/modules/pdfbox}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/pdfbox}/nav.adoc     |   0
 .../doc/modules/pdfbox/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/pdfbox/pages/about.adoc   |   0
 .../doc/modules/pdfbox/partials}/_attributes.adoc  |   0
 .../doc/modules/pdfbox/partials/module-nav.adoc    |   3 +
 .../extensions/pdfbox/dom/IsisModuleExtPdfBox.java |   0
 subdomains/pom.xml                                 | 206 +++++++++++++++++++++
 .../core/spring => subdomains/spring/impl}/pom.xml |  14 +-
 subdomains/spring/impl/src/main/doc/antora.yml     |   2 +
 .../src/main/doc/modules/spring}/_attributes.adoc  |   0
 .../impl}/src/main/doc/modules/spring/nav.adoc     |   0
 .../doc/modules/spring/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/spring/pages/about.adoc   |   0
 .../doc/modules/spring/partials}/_attributes.adoc  |   0
 .../doc/modules/spring/partials/module-nav.adoc    |   3 +
 .../extensions/spring/IsisModuleExtSpring.java     |   0
 .../extensions/spring/service/BeanDescriptor.java  |   0
 .../extensions/spring/service/ContextBeans.java    |   0
 .../spring/service/SpringBeansService.java         |   0
 .../lib => subdomains}/xdocreport/impl/pom.xml     |  14 +-
 subdomains/xdocreport/impl/src/main/doc/antora.yml |   2 +
 .../main/doc/modules/xdocreport}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/xdocreport}/nav.adoc |   0
 .../doc/modules/xdocreport/pages}/_attributes.adoc |   0
 .../main/doc/modules/xdocreport/pages/about.adoc   |   0
 .../modules/xdocreport/partials}/_attributes.adoc  |   0
 .../modules/xdocreport/partials/module-nav.adoc    |   3 +
 .../xdocreport/dom/IsisModuleExtXDocReport.java    |   0
 .../extensions/xdocreport/dom/impl/OutputType.java |   0
 .../xdocreport/dom/impl/XDocReportModel.java       |   0
 .../xdocreport/dom/impl/XDocReportService.java     |   0
 .../dom/impl/example/Generate0Fields.java          |   0
 .../xdocreport/dom/impl/example/Generate1Docx.java |   0
 .../xdocreport/dom/impl/example/Generate2Pdf.java  |   0
 .../dom/impl/example/models/Developer.java         |   0
 .../dom/impl/example/models/Project.java           |   0
 .../example/models/ProjectDevelopersModel.java     |   0
 .../impl/example/template/Project-template.docx    | Bin
 .../dom/impl/example/template/project.fields.xml   |   0
 .../dom/impl/service/XDocReportServiceTest.java    |   0
 {extensions/lib => subdomains}/zip/impl/pom.xml    |  14 +-
 subdomains/zip/impl/src/main/doc/antora.yml        |   2 +
 .../src/main/doc/modules/zip}/_attributes.adoc     |   0
 .../zip/impl/src/main/doc/modules/zip}/nav.adoc    |   0
 .../main/doc/modules/zip/pages}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/zip/pages/about.adoc |   0
 .../doc/modules/zip/partials}/_attributes.adoc     |   0
 .../main/doc/modules/zip/partials/module-nav.adoc  |   3 +
 .../isis/extensions/zip/dom/IsisModuleExtZip.java  |   0
 .../isis/extensions/zip/dom/impl/ZipService.java   |   0
 .../excel => testing/fakedata}/fixture/.gitignore  |   0
 .../fixture/logging-dn-enhance.properties          |   0
 .../testing => testing}/fakedata/fixture/pom.xml   |  22 +--
 .../fixture/src/main/java/META-INF/persistence.xml |   0
 .../fixture/IsisModuleExtFakeDataFixtures.java     |   0
 .../fixture/demoapp/demomodule/dom/EnumOf3.java    |   0
 .../demomodule/dom/FakeDataDemoObjectWithAll.java  |   0
 .../demomodule/dom/FakeDataDemoObjectWithAll.png   | Bin
 .../dom/FakeDataDemoObjectWithAllMenu.java         |   0
 .../FakeDataDemoObjectWithAll_create3.java         |   0
 .../FakeDataDemoObjectWithAll_tearDown.java        |   0
 ...eDataDemoObjectWithAll_create_withFakeData.java |   0
 ...eDataDemoObjectWithAll_update_withFakeData.java |   0
 .../testing => testing}/fakedata/impl/pom.xml      |  14 +-
 .../fakedata/impl}/src/main/doc/antora.yml         |   0
 .../main/doc/modules/fakedata}/_attributes.adoc    |   0
 .../impl/src/main/doc/modules/fakedata}/nav.adoc   |   0
 .../doc/modules/fakedata/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/fakedata/pages/about.adoc |   0
 .../modules/fakedata/partials}/_attributes.adoc    |   0
 .../doc/modules/fakedata/partials/module-nav.adoc  |   0
 .../fakedata/dom/IsisModuleExtFakeData.java        |   0
 .../dom/services/AbstractRandomValueGenerator.java |   0
 .../fakedata/dom/services/Addresses.java           |   0
 .../fakedata/dom/services/BigDecimals.java         |   0
 .../fakedata/dom/services/BigIntegers.java         |   0
 .../extensions/fakedata/dom/services/Books.java    |   0
 .../extensions/fakedata/dom/services/Booleans.java |   0
 .../extensions/fakedata/dom/services/Bytes.java    |   0
 .../extensions/fakedata/dom/services/Chars.java    |   0
 .../fakedata/dom/services/Collections.java         |   0
 .../extensions/fakedata/dom/services/Comms.java    |   0
 .../fakedata/dom/services/CreditCards.java         |   0
 .../extensions/fakedata/dom/services/Doubles.java  |   0
 .../extensions/fakedata/dom/services/Enums.java    |   0
 .../fakedata/dom/services/FakeDataService.java     |   0
 .../extensions/fakedata/dom/services/Floats.java   |   0
 .../extensions/fakedata/dom/services/Integers.java |   0
 .../fakedata/dom/services/IsisBlobs.java           |   0
 .../fakedata/dom/services/IsisClobs.java           |   0
 .../fakedata/dom/services/IsisMoneys.java          |   0
 .../fakedata/dom/services/IsisPasswords.java       |   0
 .../fakedata/dom/services/J8DateTimes.java         |   0
 .../fakedata/dom/services/J8LocalDates.java        |   0
 .../fakedata/dom/services/J8Periods.java           |   0
 .../fakedata/dom/services/JavaSqlDates.java        |   0
 .../fakedata/dom/services/JavaSqlTimestamps.java   |   0
 .../fakedata/dom/services/JavaUtilDates.java       |   0
 .../extensions/fakedata/dom/services/Longs.java    |   0
 .../extensions/fakedata/dom/services/Lorem.java    |   0
 .../extensions/fakedata/dom/services/Names.java    |   0
 .../extensions/fakedata/dom/services/Shorts.java   |   0
 .../extensions/fakedata/dom/services/Strings.java  |   0
 .../extensions/fakedata/dom/services/Urls.java     |   0
 .../extensions/fakedata/dom/services/Uuids.java    |   0
 .../services/blobs/Pawson-Naked-Objects-thesis.pdf | Bin
 .../dom/services/blobs/image01-150x150.jpg         | Bin
 .../dom/services/blobs/image01-2048x1536.jpg       | Bin
 .../dom/services/blobs/image01-240x180.jpg         | Bin
 .../dom/services/blobs/image01-4000x3000.jpg       | Bin
 .../dom/services/blobs/image01-640x480.jpg         | Bin
 .../dom/services/blobs/image02-150x150.jpg         | Bin
 .../dom/services/blobs/image02-2048x1536.jpg       | Bin
 .../dom/services/blobs/image02-240x180.jpg         | Bin
 .../dom/services/blobs/image02-4000x3000.jpg       | Bin
 .../dom/services/blobs/image02-640x480.jpg         | Bin
 .../dom/services/blobs/rick-mugridge-paper.pdf     | Bin
 .../fakedata/dom/services/clobs/RTF-Spec-1.7.rtf   |   0
 .../fakedata/dom/services/clobs/a_and_c.xml        |   0
 .../fakedata/dom/services/clobs/all_well.xml       |   0
 .../fakedata/dom/services/clobs/as_you.xml         |   0
 .../fakedata/dom/services/clobs/com_err.xml        |   0
 .../fakedata/dom/services/clobs/config.rtf         |   0
 .../fakedata/dom/services/clobs/coriolan.xml       |   0
 .../fakedata/dom/services/clobs/cymbelin.xml       |   0
 .../fakedata/dom/services/clobs/dream.xml          |   0
 .../fakedata/dom/services/clobs/dsssl.dtd          |   0
 .../extensions/fakedata/dom/services/clobs/fot.dtd |   0
 .../fakedata/dom/services/clobs/hamlet.xml         |   0
 .../fakedata/dom/services/clobs/hen_iv_1.xml       |   0
 .../fakedata/dom/services/clobs/hen_iv_2.xml       |   0
 .../fakedata/dom/services/clobs/hen_v.xml          |   0
 .../fakedata/dom/services/clobs/hen_vi_1.xml       |   0
 .../fakedata/dom/services/clobs/hen_vi_2.xml       |   0
 .../fakedata/dom/services/clobs/hen_vi_3.xml       |   0
 .../fakedata/dom/services/clobs/hen_viii.xml       |   0
 .../fakedata/dom/services/clobs/j_caesar.xml       |   0
 .../fakedata/dom/services/clobs/john.xml           |   0
 .../fakedata/dom/services/clobs/lear.xml           |   0
 .../extensions/fakedata/dom/services/clobs/lll.xml |   0
 .../fakedata/dom/services/clobs/m_for_m.xml        |   0
 .../fakedata/dom/services/clobs/m_wives.xml        |   0
 .../fakedata/dom/services/clobs/macbeth.xml        |   0
 .../fakedata/dom/services/clobs/merchant.xml       |   0
 .../fakedata/dom/services/clobs/much_ado.xml       |   0
 .../fakedata/dom/services/clobs/othello.xml        |   0
 .../fakedata/dom/services/clobs/pericles.xml       |   0
 .../fakedata/dom/services/clobs/play.dtd           |   0
 .../fakedata/dom/services/clobs/r_and_j.xml        |   0
 .../fakedata/dom/services/clobs/rich_ii.xml        |   0
 .../fakedata/dom/services/clobs/rich_iii.xml       |   0
 .../fakedata/dom/services/clobs/sample.rtf         |   0
 .../fakedata/dom/services/clobs/shaksper.htm       |   0
 .../fakedata/dom/services/clobs/style-sheet.dtd    |   0
 .../fakedata/dom/services/clobs/t_night.xml        |   0
 .../fakedata/dom/services/clobs/taming.xml         |   0
 .../fakedata/dom/services/clobs/tempest.xml        |   0
 .../fakedata/dom/services/clobs/testrtf.rtf        |   0
 .../fakedata/dom/services/clobs/timon.xml          |   0
 .../fakedata/dom/services/clobs/titus.xml          |   0
 .../fakedata/dom/services/clobs/troilus.xml        |   0
 .../fakedata/dom/services/clobs/two_gent.xml       |   0
 .../isis/extensions/fakedata/dom/services/clobs/vs |   0
 .../isis/extensions/fakedata/dom/services/clobs/vx |   0
 .../fakedata/dom/services/clobs/win_tale.xml       |   0
 .../extensions/fakedata/dom/services/clobs/xml.dcl |   0
 .../extensions/fakedata/dom/services/clobs/xml.soc |   0
 .../fakedata/dom/services/FakeDataServiceTest.java |   0
 .../fakedata}/integtests/log4j2-test.xml           |   0
 .../fakedata/integtests/pom.xml                    |  22 +--
 .../FakeDataModuleIntegTestAbstract.java           |   0
 .../integtests/tests/Bootstrap_IntegTest.java      |   0
 .../fakedata/integtests/tests/Smoke_IntegTest.java |   0
 .../fakedata}/integtests/toDoItems-actual.xlsx     | Bin
 .../fakedata/integtests/translations.pot           |   0
 {extensions/testing => testing}/fixtures/pom.xml   |  18 +-
 .../fixtures}/src/main/doc/antora.yml              |   0
 .../main/doc/modules/fixtures}/_attributes.adoc    |   0
 .../main/doc/modules/fixtures/images/composite.png | Bin
 .../main/doc/modules/fixtures/images/flat-1.png    | Bin
 .../main/doc/modules/fixtures/images/flat-2.png    | Bin
 .../images/organizing-fixture-scripts.pptx         | Bin
 .../fixtures/images/prompt-specifying-number.png   | Bin
 .../main/doc/modules/fixtures/images/prompt.png    | Bin
 .../modules/fixtures/images/prototyping-menu.png   | Bin
 .../doc/modules/fixtures/images/result-list.png    | Bin
 .../src/main/doc/modules/fixtures}/nav.adoc        |   0
 .../doc/modules/fixtures/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/fixtures/pages/about.adoc |   0
 .../pages/fixture-scripts}/_attributes.adoc        |   0
 .../pages/fixture-scripts/api-and-usage.adoc       |   0
 .../pages/fixture-scripts/sudo-service.adoc        |   0
 .../fixture-scripts/ticking-clock-fixture.adoc     |   0
 .../modules/fixtures/partials}/_attributes.adoc    |   0
 .../doc/modules/fixtures/partials/module-nav.adoc  |   0
 .../fixtures/FixturesLifecycleService.java         |   0
 .../IsisIntegrationTestAbstractWithFixtures.java   |   0
 .../extensions/fixtures/IsisModuleExtFixtures.java |   0
 .../api/FixtureScriptWithExecutionStrategy.java    |   0
 .../fixtures/api/PersonaWithBuilderScript.java     |   0
 .../extensions/fixtures/api/PersonaWithFinder.java |   0
 .../isis/extensions/fixtures/api/WithPrereqs.java  |   0
 .../isis/extensions/fixtures/api/package-info.java |   0
 .../fixtures/events/FixturesInstalledEvent.java    |   0
 .../fixtures/events/FixturesInstallingEvent.java   |   0
 .../fixturescripts/BuilderScriptAbstract.java      |   0
 .../fixturescripts/BuilderScriptWithResult.java    |   0
 .../fixturescripts/BuilderScriptWithoutResult.java |   0
 .../fixturescripts/ExecutionParameters.java        |   0
 .../fixturescripts/ExecutionParametersService.java |   0
 .../fixtures/fixturescripts/FixtureResult.java     |   0
 .../fixturescripts/FixtureResult.layout.xml        |   0
 .../fixtures/fixturescripts/FixtureResultList.java |   0
 .../fixtures/fixturescripts/FixtureScript.java     |   0
 .../fixtures/fixturescripts/FixtureScripts.java    |   0
 .../fixturespec/FixtureScriptsSpecification.java   |   0
 .../FixtureScriptsSpecificationProvider.java       |   0
 .../fixtures/fixturespec/package-info.java         |   0
 .../extensions/fixtures/legacy/FixtureClock.java   |   0
 .../fixtures/legacy/TickingFixtureClock.java       |   0
 .../fixtures/legacy/clock/ClockFixture.java        |   0
 .../fixtures/legacy/clock/TickingClockFixture.java |   0
 .../extensions/fixtures/legacy/package-info.java   |   0
 .../QueryResultsCacheControlDefault.java           |   0
 .../legacy/setup/PersonaEnumPersistAll.java        |   0
 .../legacy/teardown/TeardownFixtureAbstract.java   |   0
 .../legacy/teardown/TeardownFixtureAbstract2.java  |   0
 .../fixtures/modules/ModuleWithFixtures.java       |   0
 .../modules/ModuleWithFixturesService.java         |   0
 .../fixtures/src/main/resources}/prism.css         |   0
 .../fixtures/src/main/resources}/prism1.14.js      |   0
 .../fixturescripts/ExecutionContextTest.java       |   0
 .../ExecutionParameters_AsKeyValueMap_Test.java    |   0
 .../fixturescripts/ExecutionParameters_Test.java   |   0
 .../legacy/FixtureClockInstantiationTest.java      |   0
 testing/pom.xml                                    | 196 ++++++++++++++++++++
 .../testing => testing}/specsupport/pom.xml        |  20 +-
 .../specsupport/src/main/doc/antora.yml            |   0
 .../main/doc/modules/specsupport}/_attributes.adoc |   0
 .../src/main/doc/modules/specsupport}/nav.adoc     |   0
 .../modules/specsupport/pages}/_attributes.adoc    |   0
 .../main/doc/modules/specsupport/pages/about.adoc  |   0
 .../pages/bdd-spec-support}/_attributes.adoc       |   0
 .../pages/bdd-spec-support/how-it-works.adoc       |   0
 .../bdd-spec-support/maven-configuration.adoc      |   0
 .../pages/bdd-spec-support/writing-a-bdd-spec.adoc |   0
 .../modules/specsupport/partials}/_attributes.adoc |   0
 .../modules/specsupport/partials/module-nav.adoc   |   0
 .../specsupport/IsisModuleExtSpecSupport.java      |   0
 .../integration/ObjectFactoryForIntegration.java   |   0
 .../isis/extensions/specsupport/specs/V.java       |   0
 .../unittestsupport/impl/pom.xml                   |  10 +-
 .../unittestsupport/impl}/src/main/doc/antora.yml  |   0
 .../unit-test-support-ext}/_attributes.adoc        |   0
 .../doc/modules/unit-test-support-ext}/nav.adoc    |   0
 .../unit-test-support-ext/pages}/_attributes.adoc  |   0
 .../modules/unit-test-support-ext/pages/about.adoc |   0
 .../partials}/_attributes.adoc                     |   0
 .../unit-test-support-ext/partials/module-nav.adoc |   0
 .../dom/IsisModuleExtUnitTestSupport.java          |   0
 .../unittestsupport/dom/assertions/Asserting.java  |   0
 .../dom/bean/AbstractBeanPropertiesTest.java       |   0
 .../dom/bean/FixtureDatumFactoriesForAnyPojo.java  |   0
 .../dom/bean/FixtureDatumFactoriesForApplib.java   |   0
 .../dom/bean/FixtureDatumFactoriesForJoda.java     |   0
 .../unittestsupport/dom/bean/PojoTester.java       |   0
 .../unittestsupport/dom/matchers/IsisMatchers.java |   0
 .../dom/privatecons/PrivateConstructorTester.java  |   0
 .../unittestsupport/dom/reflect/ReflectUtils.java  |   0
 .../dom/repo/FinderInteraction.java                |   0
 .../unittestsupport/dom/valuetypes/VT.java         |   0
 .../dom/bean/PojoTesterTest_interference.java      |   0
 {extensions/vw => valuetypes}/asciidoc/pom.xml     |  14 +-
 valuetypes/asciidoc/src/main/doc/antora.yml        |   2 +
 .../main/doc/modules/asciidoc}/_attributes.adoc    |   0
 .../src/main/doc/modules/asciidoc}/nav.adoc        |   0
 .../doc/modules/asciidoc}/pages/_attributes.adoc   |   0
 .../src/main/doc/modules/asciidoc/pages/about.adoc |   0
 .../modules/asciidoc/partials}/_attributes.adoc    |   0
 .../doc/modules/asciidoc/partials/module-nav.adoc  |   0
 .../applib/IsisModuleExtAsciidocApplib.java        |   0
 .../extensions/asciidoc/applib/value/AsciiDoc.java |   0
 .../asciidoc/ui/IsisModuleExtAsciidocUi.java       |   0
 .../asciidoc/ui/components/AsciiDocComponent.java  |   0
 .../AsciiDocPanelFactoriesForWicket.java           |   0
 .../asciidoc/ui/components/css/prism.css           |   0
 .../asciidoc/ui/components/js/prism1.14.js         |   0
 .../asciidoc/ui/converter/AsciiDocConverter.java   |   0
 {extensions/vw => valuetypes}/markdown/pom.xml     |  14 +-
 valuetypes/markdown/src/main/doc/antora.yml        |   2 +
 .../main/doc/modules/markdown}/_attributes.adoc    |   0
 .../src/main/doc/modules/markdown}/nav.adoc        |   0
 .../doc/modules/markdown}/pages/_attributes.adoc   |   0
 .../src/main/doc/modules/markdown/pages/about.adoc |   0
 .../modules/markdown/partials}/_attributes.adoc    |   0
 .../doc/modules/markdown/partials/module-nav.adoc  |   0
 .../applib/IsisModuleExtMarkdownApplib.java        |   0
 .../extensions/markdown/applib/value/Markdown.java |   0
 .../markdown/ui/IsisModuleExtMarkdownUi.java       |   0
 .../markdown/ui/components/MarkdownComponent.java  |   0
 .../MarkdownPanelFactoriesForWicket.java           |   0
 .../markdown/ui/components/css}/prism.css          |   0
 .../markdown/ui/components/js}/prism1.14.js        |   0
 .../markdown/ui/converter/MarkdownConverter.java   |   0
 valuetypes/pom.xml                                 | 174 +++++++++++++++++
 {extensions/vw => valuetypes}/sse/pom.xml          |  14 +-
 valuetypes/sse/src/main/doc/antora.yml             |   2 +
 .../sse/src/main/doc/modules/sse}/_attributes.adoc |   0
 .../sse/src/main/doc/modules/sse/nav.adoc          |   0
 .../main/doc/modules/sse}/pages/_attributes.adoc   |   0
 .../sse/src/main/doc/modules/sse/pages/about.adoc  |   0
 .../doc/modules/sse/partials}/_attributes.adoc     |   0
 .../main/doc/modules/sse/partials/module-nav.adoc  |   0
 .../isis/extensions/sse/IsisModuleExtSse.java      |   0
 .../isis/extensions/sse/SseMetaModelPlugin.java    |   0
 .../isis/extensions/sse/api/ServerSentEvents.java  |   0
 .../apache/isis/extensions/sse/api/SseChannel.java |   0
 .../apache/isis/extensions/sse/api/SseService.java |   0
 .../apache/isis/extensions/sse/api/SseSource.java  |   0
 .../sse/facets/SseAnnotationFacetFactory.java      |   0
 .../extensions/sse/facets/SseObserveFacet.java     |   0
 .../sse/facets/SseObserveFacetAbstract.java        |   0
 ...eObserveFacetForServerSentEventsAnnotation.java |   0
 .../extensions/sse/markup/ListeningMarkup.java     |   0
 .../sse/markup/ListeningMarkupComponent.java       |   0
 .../markup/ListeningMarkupComponent_observing.java |   0
 .../ListeningMarkupPanelFactoriesForWicket.java    |   0
 .../extensions/sse/markup/js/ObservingComponent.js |   0
 .../extensions/sse/services/SseServiceDefault.java |   0
 .../sse/webmodule/ServerSentEventsServlet.java     |   0
 .../sse/webmodule/WebModuleServerSentEvents.java   |   0
 858 files changed, 1355 insertions(+), 620 deletions(-)
 create mode 100644 antora/components/mappings/antora.yml
 rename {legacy/vro/restclient/src/main/doc/modules/restclient => antora/components/mappings/modules/ROOT}/_attributes.adoc (100%)
 create mode 100644 antora/components/mappings/modules/ROOT/nav.adoc
 rename {legacy/vro/restclient/src/main/doc/modules/restclient/partials => antora/components/mappings/modules/ROOT/pages}/_attributes.adoc (100%)
 copy {extensions/lib/base/impl/src/main/doc/modules/base => antora/components/mappings/modules/ROOT}/pages/about.adoc (95%)
 rename {legacy/vro/restclient/src/main/doc/modules/restclient/pages => antora/components/mappings/modules/ROOT/partials}/_attributes.adoc (100%)
 create mode 100644 antora/components/mappings/modules/ROOT/partials/component-nav.adoc
 copy antora/components/{legacy => mappings}/modules/ROOT/partials/module-nav.adoc (100%)
 create mode 100644 antora/components/subdomains/antora.yml
 rename {legacy/testsupport/mavenplugin/src/main/doc/modules/mvn => antora/components/subdomains/modules/ROOT}/_attributes.adoc (100%)
 create mode 100644 antora/components/subdomains/modules/ROOT/nav.adoc
 rename {legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials => antora/components/subdomains/modules/ROOT/pages}/_attributes.adoc (100%)
 copy {extensions/lib/base/impl/src/main/doc/modules/base => antora/components/subdomains/modules/ROOT}/pages/about.adoc (95%)
 rename {legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages => antora/components/subdomains/modules/ROOT/partials}/_attributes.adoc (100%)
 create mode 100644 antora/components/subdomains/modules/ROOT/partials/component-nav.adoc
 copy antora/components/{legacy => subdomains}/modules/ROOT/partials/module-nav.adoc (100%)
 rename antora/components/toc/modules/ROOT/pages/landing-page/{extensions-catalog.adoc => catalogs.adoc} (50%)
 create mode 100644 antora/components/valuetypes/antora.yml
 rename {legacy/core/runtime/src/main/doc/modules/runtime => antora/components/valuetypes/modules/ROOT}/_attributes.adoc (100%)
 create mode 100644 antora/components/valuetypes/modules/ROOT/nav.adoc
 rename {legacy/core/runtime/src/main/doc/modules/runtime/partials => antora/components/valuetypes/modules/ROOT/pages}/_attributes.adoc (100%)
 copy {extensions/lib/docx/impl/src/main/doc/modules/docx => antora/components/valuetypes/modules/ROOT}/pages/about.adoc (95%)
 rename {legacy/core/runtime/src/main/doc/modules/runtime/pages => antora/components/valuetypes/modules/ROOT/partials}/_attributes.adoc (100%)
 create mode 100644 antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc
 copy antora/components/{legacy => valuetypes}/modules/ROOT/partials/module-nav.adoc (100%)
 delete mode 100644 extensions/core/spring/src/main/doc/antora.yml
 delete mode 100644 extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
 delete mode 100644 extensions/lib/base/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
 delete mode 100644 extensions/lib/docx/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
 delete mode 100644 extensions/lib/excel/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
 delete mode 100644 extensions/lib/freemarker/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
 delete mode 100644 extensions/lib/jaxrsclient/impl/pom.xml
 delete mode 100644 extensions/lib/jaxrsclient/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
 delete mode 100644 extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
 delete mode 100644 extensions/lib/minio/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
 delete mode 100644 extensions/lib/ognl/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
 delete mode 100644 extensions/lib/pdfbox/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
 delete mode 100644 extensions/lib/slack/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
 delete mode 100644 extensions/lib/xdocreport/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
 delete mode 100644 extensions/lib/zip/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/lib/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
 delete mode 100644 extensions/vro/restclient/src/main/doc/antora.yml
 delete mode 100644 extensions/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
 delete mode 100644 extensions/vw/asciidoc/src/main/doc/antora.yml
 delete mode 100644 extensions/vw/markdown/src/main/doc/antora.yml
 delete mode 100644 extensions/vw/servletapi/impl/src/main/doc/antora.yml
 delete mode 100644 extensions/vw/sse/src/main/doc/antora.yml
 delete mode 100644 incubator/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
 rename incubator/{ => extensions}/core/jsr303/README.adoc (100%)
 rename incubator/{ => extensions}/core/jsr303/pom.xml (100%)
 rename incubator/{ => extensions}/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java (100%)
 rename incubator/{ => extensions}/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java (100%)
 rename incubator/{ => extensions}/core/microprofile/pom.xml (97%)
 rename incubator/{core/model => extensions/core/microprofile}/src/main/doc/antora.yml (100%)
 rename {legacy/core/commons/src/main/doc/modules/commons => incubator/extensions/core/microprofile/src/main/doc/modules/microprofile}/_attributes.adoc (100%)
 rename incubator/{core/model/src/main/doc/modules/model => extensions/core/microprofile/src/main/doc/modules/microprofile}/nav.adoc (100%)
 rename {legacy/core/commons/src/main/doc/modules/commons/partials => incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages}/_attributes.adoc (100%)
 rename incubator/{ => extensions}/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc (100%)
 rename {legacy/core/commons/src/main/doc/modules/commons/pages => incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials}/_attributes.adoc (100%)
 create mode 100644 incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
 rename incubator/{ => extensions}/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java (100%)
 rename incubator/{ => extensions}/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (100%)
 rename incubator/{ => extensions}/core/model/pom.xml (97%)
 rename incubator/{core/microprofile => extensions/core/model}/src/main/doc/antora.yml (100%)
 rename {legacy/core/applib/src/main/doc/modules/applib => incubator/extensions/core/model/src/main/doc/modules/model}/_attributes.adoc (100%)
 rename incubator/{core/microprofile/src/main/doc/modules/microprofile => extensions/core/model/src/main/doc/modules/model}/nav.adoc (100%)
 rename {legacy/core/applib/src/main/doc/modules/applib/partials => incubator/extensions/core/model/src/main/doc/modules/model/pages}/_attributes.adoc (100%)
 rename incubator/{ => extensions}/core/model/src/main/doc/modules/model/pages/about.adoc (100%)
 rename {legacy/core/applib/src/main/doc/modules/applib/pages => incubator/extensions/core/model/src/main/doc/modules/model/partials}/_attributes.adoc (100%)
 rename incubator/{ => extensions}/core/model/src/main/doc/modules/model/partials/module-nav.adoc (100%)
 rename incubator/{ => extensions}/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java (100%)
 rename incubator/{ => extensions}/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java (100%)
 rename incubator/{ => extensions}/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java (100%)
 rename incubator/{ => extensions}/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java (100%)
 rename incubator/{ => extensions}/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java (100%)
 rename legacy/{core/runtime => extensions/core/applib}/.gitignore (100%)
 rename legacy/{ => extensions}/core/applib/pom.xml (97%)
 copy legacy/{vro/restclient => extensions/core/applib}/src/main/doc/antora.yml (100%)
 rename {incubator/core/model/src/main/doc/modules/model => legacy/extensions/core/applib/src/main/doc/modules/applib}/_attributes.adoc (100%)
 rename legacy/{vro/restclient/src/main/doc/modules/restclient => extensions/core/applib/src/main/doc/modules/applib}/nav.adoc (100%)
 rename {incubator/core/model/src/main/doc/modules/model/partials => legacy/extensions/core/applib/src/main/doc/modules/applib/pages}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/applib/src/main/doc/modules/applib/pages/about.adoc (100%)
 rename {incubator/core/model/src/main/doc/modules/model/pages => legacy/extensions/core/applib/src/main/doc/modules/applib/partials}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filters.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundCommandService2.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService2.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Magnitude.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java (100%)
 rename legacy/{ => extensions}/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java (100%)
 rename legacy/{ => extensions}/core/applib/src/test/java/org/apache/isis/legacy/applib/value/ColorTest.java (100%)
 rename legacy/{ => extensions}/core/applib/src/test/java/org/apache/isis/legacy/applib/value/MoneyTest.java (100%)
 rename legacy/{ => extensions}/core/applib/src/test/java/org/apache/isis/legacy/applib/value/PercentageTest.java (100%)
 rename legacy/{core/metamodel => extensions/core/commons}/.gitignore (100%)
 rename legacy/{ => extensions}/core/commons/pom.xml (97%)
 rename legacy/{core/runtime => extensions/core/commons}/src/main/doc/antora.yml (100%)
 rename {incubator/core/microprofile/src/main/doc/modules/microprofile => legacy/extensions/core/commons/src/main/doc/modules/commons}/_attributes.adoc (100%)
 rename legacy/{core/runtime/src/main/doc/modules/runtime => extensions/core/commons/src/main/doc/modules/commons}/nav.adoc (100%)
 rename {incubator/core/microprofile/src/main/doc/modules/microprofile/partials => legacy/extensions/core/commons/src/main/doc/modules/commons/pages}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/commons/src/main/doc/modules/commons/pages/about.adoc (100%)
 rename {incubator/core/microprofile/src/main/doc/modules/microprofile/pages => legacy/extensions/core/commons/src/main/doc/modules/commons/partials}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc (100%)
 rename legacy/{ => extensions}/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java (100%)
 rename legacy/{ => extensions}/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java (100%)
 rename legacy/{ => extensions}/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSizeAdvisor.java (100%)
 rename legacy/{ => extensions}/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java (100%)
 rename legacy/{ => extensions}/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupportTest.java (100%)
 rename legacy/{core/commons => extensions/core/metamodel}/.gitignore (100%)
 rename legacy/{ => extensions}/core/metamodel/pom.xml (98%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacet.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueSemanticsProvider.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacet.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacetUsingSemanticsProviderFactory.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueFacetUsingSemanticsProviderFactory.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java (100%)
 rename legacy/{ => extensions}/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java (100%)
 rename legacy/{core/applib => extensions/core/runtime}/.gitignore (100%)
 rename legacy/{ => extensions}/core/runtime/pom.xml (98%)
 rename legacy/{core/commons => extensions/core/runtime}/src/main/doc/antora.yml (100%)
 rename {extensions/vw/sse/src/main/doc/modules/sse => legacy/extensions/core/runtime/src/main/doc/modules/runtime}/_attributes.adoc (100%)
 rename legacy/{core/commons/src/main/doc/modules/commons => extensions/core/runtime/src/main/doc/modules/runtime}/nav.adoc (100%)
 rename {extensions/vw/sse/src/main/doc/modules/sse/partials => legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/doc/modules/runtime/pages/about.adoc (100%)
 rename {extensions/vw/sse/src/main/doc/modules/sse/pages => legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials}/_attributes.adoc (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/jdo/datanucleus5/datanucleus/valuetypes/IsisMoneyMapping.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializer.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializerJaxp.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/sysout/SystemPrinter.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/LoggingLocation.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/ObjectFactory.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/SuspendableListener.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/AbstractServletOrFilterMapping.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/FilterSpecification.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/ServletSpecification.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/WebAppSpecification.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java (100%)
 rename legacy/{ => extensions}/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java (100%)
 rename legacy/{vro => mappings}/restclient/pom.xml (100%)
 rename legacy/{core/applib => mappings/restclient}/src/main/doc/antora.yml (100%)
 rename {extensions/vw/servletapi/impl/src/main/doc/modules/servletapi => legacy/mappings/restclient/src/main/doc/modules/restclient}/_attributes.adoc (100%)
 rename legacy/{core/applib/src/main/doc/modules/applib => mappings/restclient/src/main/doc/modules/restclient}/nav.adoc (100%)
 rename {extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/partials => legacy/mappings/restclient/src/main/doc/modules/restclient/pages}/_attributes.adoc (100%)
 rename legacy/{vro => mappings}/restclient/src/main/doc/modules/restclient/pages/about.adoc (100%)
 rename {extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/pages => legacy/mappings/restclient/src/main/doc/modules/restclient/partials}/_attributes.adoc (100%)
 rename legacy/{vro => mappings}/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/ClientRequestFactory.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/RepresentationWalker.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClient.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClientException.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientExecutor.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequest.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java (100%)
 rename legacy/{vro => mappings}/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java (100%)
 rename legacy/{vro => mappings}/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java (100%)
 copy {extensions/lib/pdfbox => legacy/subdomains/servletapi}/impl/pom.xml (75%)
 copy legacy/{vro/restclient => subdomains/servletapi/impl}/src/main/doc/antora.yml (100%)
 rename {extensions/vw/markdown/src/main/doc/modules/markdown => legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi}/_attributes.adoc (100%)
 rename {extensions/vw => legacy/subdomains}/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc (100%)
 rename {extensions/vw/markdown/src/main/doc/modules/markdown/partials => legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages}/_attributes.adoc (100%)
 rename {extensions/vw => legacy/subdomains}/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc (100%)
 rename {extensions/vw/markdown/src/main/doc/modules/markdown/pages => legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials}/_attributes.adoc (100%)
 rename {extensions/vw => legacy/subdomains}/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc (100%)
 copy extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java => legacy/subdomains/servletapi/impl/src/main/java/org/apache/isis/subdomains/servletapi/dom/IsisModuleSubServletApi.java (91%)
 rename legacy/{testsupport => testing}/mavenplugin/pom.xml (100%)
 rename legacy/{vro/restclient => testing/mavenplugin}/src/main/doc/antora.yml (100%)
 rename {extensions/vw/asciidoc/src/main/doc/modules/asciidoc => legacy/testing/mavenplugin/src/main/doc/modules/mvn}/_attributes.adoc (100%)
 rename legacy/{testsupport/mavenplugin/src/main/doc/modules/mvn/examples => testing/mavenplugin/src/main/doc/modules/mvn/attachments}/.gitkeep (100%)
 rename legacy/{testsupport/mavenplugin/src/main/doc/modules/mvn/attachments => testing/mavenplugin/src/main/doc/modules/mvn/examples}/.gitkeep (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/nav.adoc (100%)
 rename {extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials => legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages}/_attributes.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc (100%)
 rename {extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages => legacy/testing/mavenplugin/src/main/doc/modules/mvn/partials}/_attributes.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java (100%)
 rename legacy/{testsupport => testing}/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java (100%)
 rename {extensions/vw/servletapi => mappings/jaxrsclient}/impl/pom.xml (73%)
 rename {extensions/testing/fakedata => mappings/jaxrsclient}/impl/src/main/doc/antora.yml (51%)
 rename {extensions/vro/restclient/src/main/doc/modules/restclient => mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient}/_attributes.adoc (100%)
 rename {extensions/lib/zip/impl/src/main/doc/modules/zip => mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient}/nav.adoc (100%)
 rename {extensions/vro/restclient/src/main/doc/modules/restclient/partials => mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages}/_attributes.adoc (100%)
 rename {extensions/lib => mappings}/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc (100%)
 rename {extensions/vro/restclient/src/main/doc/modules/restclient/pages => mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials}/_attributes.adoc (100%)
 create mode 100644 mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
 rename {extensions/vw/servletapi => mappings/jaxrsclient}/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java (100%)
 rename {extensions/lib => mappings}/minio/impl/pom.xml (77%)
 copy {extensions/persistence/flywayjdo => mappings/minio}/impl/src/main/doc/antora.yml (51%)
 rename {extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext => mappings/minio/impl/src/main/doc/modules/minio}/_attributes.adoc (100%)
 rename {extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport => mappings/minio/impl/src/main/doc/modules/minio}/nav.adoc (100%)
 rename {extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials => mappings/minio/impl/src/main/doc/modules/minio/pages}/_attributes.adoc (100%)
 rename {extensions/lib => mappings}/minio/impl/src/main/doc/modules/minio/pages/about.adoc (100%)
 rename {extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages => mappings/minio/impl/src/main/doc/modules/minio/partials}/_attributes.adoc (100%)
 create mode 100644 mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
 create mode 100644 mappings/pom.xml
 rename {extensions/vro/restclient => mappings/restclient/impl}/pom.xml (81%)
 copy {extensions/persistence/flywayjdo => mappings/restclient}/impl/src/main/doc/antora.yml (51%)
 rename {extensions/testing/specsupport/src/main/doc/modules/specsupport => mappings/restclient/impl/src/main/doc/modules/restclient}/_attributes.adoc (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/doc/modules/restclient/nav.adoc (100%)
 rename {extensions/testing/specsupport/src/main/doc/modules/specsupport/partials => mappings/restclient/impl/src/main/doc/modules/restclient/pages}/_attributes.adoc (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/doc/modules/restclient/pages/about.adoc (100%)
 rename {extensions/testing/specsupport/src/main/doc/modules/specsupport/pages => mappings/restclient/impl/src/main/doc/modules/restclient/partials}/_attributes.adoc (100%)
 create mode 100644 mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java (100%)
 rename {extensions/vro/restclient => mappings/restclient/impl}/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java (100%)
 rename {extensions/lib => mappings}/slack/impl/pom.xml (77%)
 copy {extensions/persistence/flywayjdo => mappings/slack}/impl/src/main/doc/antora.yml (51%)
 rename {extensions/testing/fixtures/src/main/doc/modules/fixtures => mappings/slack/impl/src/main/doc/modules/slack}/_attributes.adoc (100%)
 rename {extensions/lib => mappings}/slack/impl/src/main/doc/modules/slack/nav.adoc (100%)
 rename {extensions/testing/fixtures/src/main/doc/modules/fixtures/partials => mappings/slack/impl/src/main/doc/modules/slack/pages}/_attributes.adoc (100%)
 rename {extensions/lib => mappings}/slack/impl/src/main/doc/modules/slack/pages/about.adoc (100%)
 rename {extensions/testing/fixtures/src/main/doc/modules/fixtures/pages => mappings/slack/impl/src/main/doc/modules/slack/partials}/_attributes.adoc (100%)
 create mode 100644 mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
 rename {extensions/lib => mappings}/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java (100%)
 copy site-legacy.yml => site-mappings.yml (76%)
 copy site-testing.yml => site-subdomains.yml (55%)
 copy site-incubator.yml => site-valuetypes.yml (78%)
 rename {extensions/lib => subdomains}/base/impl/pom.xml (79%)
 create mode 100644 subdomains/base/impl/src/main/doc/antora.yml
 rename {extensions/testing/fakedata/impl/src/main/doc/modules/fakedata => subdomains/base/impl/src/main/doc/modules/base}/_attributes.adoc (100%)
 rename {extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox => subdomains/base/impl/src/main/doc/modules/base}/nav.adoc (100%)
 rename {extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials => subdomains/base/impl/src/main/doc/modules/base/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/doc/modules/base/pages/about.adoc (100%)
 rename {extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages => subdomains/base/impl/src/main/doc/modules/base/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java (100%)
 rename {extensions/lib => subdomains}/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java (100%)
 rename {extensions/lib => subdomains}/docx/impl/pom.xml (75%)
 create mode 100644 subdomains/docx/impl/src/main/doc/antora.yml
 rename {extensions/lib/zip/impl/src/main/doc/modules/zip => subdomains/docx/impl/src/main/doc/modules/docx}/_attributes.adoc (100%)
 rename {extensions/lib/ognl/impl/src/main/doc/modules/ognl => subdomains/docx/impl/src/main/doc/modules/docx}/nav.adoc (100%)
 rename {extensions/lib/zip/impl/src/main/doc/modules/zip/partials => subdomains/docx/impl/src/main/doc/modules/docx/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/docx/impl/src/main/doc/modules/docx/pages/about.adoc (100%)
 rename {extensions/lib/zip/impl/src/main/doc/modules/zip/pages => subdomains/docx/impl/src/main/doc/modules/docx/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java (100%)
 rename {extensions/testing/fakedata => subdomains/excel}/fixture/.gitignore (100%)
 rename {extensions/testing/fakedata => subdomains/excel}/fixture/logging-dn-enhance.properties (100%)
 rename {extensions/lib => subdomains}/excel/fixture/pom.xml (79%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/META-INF/persistence.xml (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java (100%)
 rename {extensions/lib => subdomains}/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/pom.xml (85%)
 create mode 100644 subdomains/excel/impl/src/main/doc/antora.yml
 rename {extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport => subdomains/excel/impl/src/main/doc/modules/excel}/_attributes.adoc (100%)
 rename {extensions/lib/minio/impl/src/main/doc/modules/minio => subdomains/excel/impl/src/main/doc/modules/excel}/nav.adoc (100%)
 rename {extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials => subdomains/excel/impl/src/main/doc/modules/excel/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/doc/modules/excel/pages/about.adoc (100%)
 rename {extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/pages => subdomains/excel/impl/src/main/doc/modules/excel/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java (100%)
 rename {extensions/lib => subdomains}/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java (100%)
 rename {extensions/testing/fakedata => subdomains/excel}/integtests/log4j2-test.xml (100%)
 rename {extensions/lib => subdomains}/excel/integtests/pom.xml (80%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx (100%)
 rename {extensions/lib => subdomains}/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx (100%)
 rename {extensions/testing/fakedata => subdomains/excel}/integtests/toDoItems-actual.xlsx (100%)
 rename {extensions/lib => subdomains}/excel/integtests/translations.pot (100%)
 rename {extensions/lib => subdomains}/freemarker/impl/pom.xml (81%)
 create mode 100644 subdomains/freemarker/impl/src/main/doc/antora.yml
 rename {extensions/lib/slack/impl/src/main/doc/modules/slack => subdomains/freemarker/impl/src/main/doc/modules/freemarker}/_attributes.adoc (100%)
 rename {extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient => subdomains/freemarker/impl/src/main/doc/modules/freemarker}/nav.adoc (100%)
 rename {extensions/lib/slack/impl/src/main/doc/modules/slack/partials => subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc (100%)
 rename {extensions/lib/slack/impl/src/main/doc/modules/slack/pages => subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java (100%)
 rename {extensions/lib => subdomains}/ognl/impl/pom.xml (81%)
 create mode 100644 subdomains/ognl/impl/src/main/doc/antora.yml
 rename {extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox => subdomains/ognl/impl/src/main/doc/modules/ognl}/_attributes.adoc (100%)
 rename {extensions/lib/freemarker/impl/src/main/doc/modules/freemarker => subdomains/ognl/impl/src/main/doc/modules/ognl}/nav.adoc (100%)
 rename {extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials => subdomains/ognl/impl/src/main/doc/modules/ognl/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc (100%)
 rename {extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/pages => subdomains/ognl/impl/src/main/doc/modules/ognl/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java (100%)
 rename {extensions/lib => subdomains}/pdfbox/impl/pom.xml (81%)
 create mode 100644 subdomains/pdfbox/impl/src/main/doc/antora.yml
 rename {extensions/lib/ognl/impl/src/main/doc/modules/ognl => subdomains/pdfbox/impl/src/main/doc/modules/pdfbox}/_attributes.adoc (100%)
 rename {extensions/lib/excel/impl/src/main/doc/modules/excel => subdomains/pdfbox/impl/src/main/doc/modules/pdfbox}/nav.adoc (100%)
 rename {extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials => subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc (100%)
 rename {extensions/lib/ognl/impl/src/main/doc/modules/ognl/pages => subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java (100%)
 create mode 100644 subdomains/pom.xml
 rename {extensions/core/spring => subdomains/spring/impl}/pom.xml (79%)
 create mode 100644 subdomains/spring/impl/src/main/doc/antora.yml
 rename {extensions/lib/minio/impl/src/main/doc/modules/minio => subdomains/spring/impl/src/main/doc/modules/spring}/_attributes.adoc (100%)
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/doc/modules/spring/nav.adoc (100%)
 rename {extensions/lib/minio/impl/src/main/doc/modules/minio/partials => subdomains/spring/impl/src/main/doc/modules/spring/pages}/_attributes.adoc (100%)
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/doc/modules/spring/pages/about.adoc (100%)
 rename {extensions/lib/minio/impl/src/main/doc/modules/minio/pages => subdomains/spring/impl/src/main/doc/modules/spring/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java (100%)
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java (100%)
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java (100%)
 rename {extensions/core/spring => subdomains/spring/impl}/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/pom.xml (88%)
 create mode 100644 subdomains/xdocreport/impl/src/main/doc/antora.yml
 rename {extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient => subdomains/xdocreport/impl/src/main/doc/modules/xdocreport}/_attributes.adoc (100%)
 rename {extensions/lib/docx/impl/src/main/doc/modules/docx => subdomains/xdocreport/impl/src/main/doc/modules/xdocreport}/nav.adoc (100%)
 rename {extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials => subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc (100%)
 rename {extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages => subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml (100%)
 rename {extensions/lib => subdomains}/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java (100%)
 rename {extensions/lib => subdomains}/zip/impl/pom.xml (83%)
 create mode 100644 subdomains/zip/impl/src/main/doc/antora.yml
 rename {extensions/lib/freemarker/impl/src/main/doc/modules/freemarker => subdomains/zip/impl/src/main/doc/modules/zip}/_attributes.adoc (100%)
 rename {extensions/lib/base/impl/src/main/doc/modules/base => subdomains/zip/impl/src/main/doc/modules/zip}/nav.adoc (100%)
 rename {extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials => subdomains/zip/impl/src/main/doc/modules/zip/pages}/_attributes.adoc (100%)
 rename {extensions/lib => subdomains}/zip/impl/src/main/doc/modules/zip/pages/about.adoc (100%)
 rename {extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/pages => subdomains/zip/impl/src/main/doc/modules/zip/partials}/_attributes.adoc (100%)
 create mode 100644 subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
 rename {extensions/lib => subdomains}/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java (100%)
 rename {extensions/lib => subdomains}/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java (100%)
 rename {extensions/lib/excel => testing/fakedata}/fixture/.gitignore (100%)
 rename {extensions/lib/excel => testing/fakedata}/fixture/logging-dn-enhance.properties (100%)
 rename {extensions/testing => testing}/fakedata/fixture/pom.xml (75%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/META-INF/persistence.xml (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java (100%)
 rename {extensions/testing => testing}/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/pom.xml (85%)
 rename {legacy/testsupport/mavenplugin => testing/fakedata/impl}/src/main/doc/antora.yml (100%)
 rename {extensions/lib/excel/impl/src/main/doc/modules/excel => testing/fakedata/impl/src/main/doc/modules/fakedata}/_attributes.adoc (100%)
 rename {extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext => testing/fakedata/impl/src/main/doc/modules/fakedata}/nav.adoc (100%)
 rename {extensions/lib/excel/impl/src/main/doc/modules/excel/partials => testing/fakedata/impl/src/main/doc/modules/fakedata/pages}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc (100%)
 rename {extensions/lib/excel/impl/src/main/doc/modules/excel/pages => testing/fakedata/impl/src/main/doc/modules/fakedata/partials}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc (100%)
 rename {extensions/testing => testing}/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java (100%)
 rename {extensions/lib/excel => testing/fakedata}/integtests/log4j2-test.xml (100%)
 rename {extensions/testing => testing}/fakedata/integtests/pom.xml (75%)
 rename {extensions/testing => testing}/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java (100%)
 rename {extensions/testing => testing}/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java (100%)
 rename {extensions/testing => testing}/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java (100%)
 rename {extensions/lib/excel => testing/fakedata}/integtests/toDoItems-actual.xlsx (100%)
 rename {extensions/testing => testing}/fakedata/integtests/translations.pot (100%)
 rename {extensions/testing => testing}/fixtures/pom.xml (82%)
 rename {extensions/testing/unittestsupport/impl => testing/fixtures}/src/main/doc/antora.yml (100%)
 rename {extensions/lib/docx/impl/src/main/doc/modules/docx => testing/fixtures/src/main/doc/modules/fixtures}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/composite.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/flat-1.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/flat-2.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/prompt.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/images/result-list.png (100%)
 rename {extensions/testing/specsupport/src/main/doc/modules/specsupport => testing/fixtures/src/main/doc/modules/fixtures}/nav.adoc (100%)
 rename {extensions/lib/docx/impl/src/main/doc/modules/docx/partials => testing/fixtures/src/main/doc/modules/fixtures/pages}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/pages/about.adoc (100%)
 rename {extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support => testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc (100%)
 rename {extensions/lib/docx/impl/src/main/doc/modules/docx/pages => testing/fixtures/src/main/doc/modules/fixtures/partials}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java (100%)
 rename {extensions/testing => testing}/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java (100%)
 rename {extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css => testing/fixtures/src/main/resources}/prism.css (100%)
 rename {extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js => testing/fixtures/src/main/resources}/prism1.14.js (100%)
 rename {extensions/testing => testing}/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java (100%)
 rename {extensions/testing => testing}/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java (100%)
 rename {extensions/testing => testing}/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java (100%)
 rename {extensions/testing => testing}/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java (100%)
 create mode 100644 testing/pom.xml
 rename {extensions/testing => testing}/specsupport/pom.xml (84%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/antora.yml (100%)
 rename {extensions/lib/base/impl/src/main/doc/modules/base => testing/specsupport/src/main/doc/modules/specsupport}/_attributes.adoc (100%)
 rename {extensions/testing/fixtures/src/main/doc/modules/fixtures => testing/specsupport/src/main/doc/modules/specsupport}/nav.adoc (100%)
 rename {extensions/lib/base/impl/src/main/doc/modules/base/partials => testing/specsupport/src/main/doc/modules/specsupport/pages}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/modules/specsupport/pages/about.adoc (100%)
 rename {extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts => testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc (100%)
 rename {extensions/lib/base/impl/src/main/doc/modules/base/pages => testing/specsupport/src/main/doc/modules/specsupport/partials}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc (100%)
 rename {extensions/testing => testing}/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java (100%)
 rename {extensions/testing => testing}/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java (100%)
 rename {extensions/testing => testing}/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/pom.xml (82%)
 rename {extensions/testing/fixtures => testing/unittestsupport/impl}/src/main/doc/antora.yml (100%)
 rename {extensions/core/spring/src/main/doc/modules/spring => testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext}/_attributes.adoc (100%)
 rename {extensions/testing/fakedata/impl/src/main/doc/modules/fakedata => testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext}/nav.adoc (100%)
 rename {extensions/core/spring/src/main/doc/modules/spring/partials => testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc (100%)
 rename {extensions/core/spring/src/main/doc/modules/spring/pages => testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials}/_attributes.adoc (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java (100%)
 rename {extensions/testing => testing}/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/pom.xml (90%)
 create mode 100644 valuetypes/asciidoc/src/main/doc/antora.yml
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/asciidoc/src/main/doc/modules/asciidoc}/_attributes.adoc (100%)
 rename {extensions/vw/markdown/src/main/doc/modules/markdown => valuetypes/asciidoc/src/main/doc/modules/asciidoc}/nav.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/asciidoc/src/main/doc/modules/asciidoc}/pages/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp/pages => valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials}/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js (100%)
 rename {extensions/vw => valuetypes}/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java (100%)
 rename {extensions/vw => valuetypes}/markdown/pom.xml (84%)
 create mode 100644 valuetypes/markdown/src/main/doc/antora.yml
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/markdown/src/main/doc/modules/markdown}/_attributes.adoc (100%)
 rename {extensions/vw/asciidoc/src/main/doc/modules/asciidoc => valuetypes/markdown/src/main/doc/modules/markdown}/nav.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/markdown/src/main/doc/modules/markdown}/pages/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/doc/modules/markdown/pages/about.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp/pages => valuetypes/markdown/src/main/doc/modules/markdown/partials}/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java (100%)
 rename {extensions/testing/fixtures/src/main/resources => valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css}/prism.css (100%)
 rename {extensions/testing/fixtures/src/main/resources => valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js}/prism1.14.js (100%)
 rename {extensions/vw => valuetypes}/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java (100%)
 create mode 100644 valuetypes/pom.xml
 rename {extensions/vw => valuetypes}/sse/pom.xml (82%)
 create mode 100644 valuetypes/sse/src/main/doc/antora.yml
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/sse/src/main/doc/modules/sse}/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/doc/modules/sse/nav.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp => valuetypes/sse/src/main/doc/modules/sse}/pages/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/doc/modules/sse/pages/about.adoc (100%)
 copy {starters/src/main/doc/modules/simpleapp/pages => valuetypes/sse/src/main/doc/modules/sse/partials}/_attributes.adoc (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/doc/modules/sse/partials/module-nav.adoc (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java (100%)
 rename {extensions/vw => valuetypes}/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java (100%)


[isis] 01/05: ISIS-2062; tiny improvement to preview.sh

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

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

commit f628db0f4de03e40902e394f94654657dc889571
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 07:47:32 2020 +0000

    ISIS-2062; tiny improvement to preview.sh
---
 preview.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/preview.sh b/preview.sh
index 2d98177..27f8c2c 100644
--- a/preview.sh
+++ b/preview.sh
@@ -7,7 +7,7 @@ if [[ $# -gt 0 ]]; then
   if [ -f $1 ]; then
     PLAYBOOK_FILE=$1
   else
-    PLAYBOOK_FILE=antora/playbooks/site-$1.yml
+    echo "no such file $PLAYBOOK_FILE - using site.yml" >&2
   fi
   shift
 fi


[isis] 03/05: ISIS-2259: fixes compile issues.

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

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

commit cad702ba37f5e59a95ae80a2539ced0cee770926
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 17:51:48 2020 +0000

    ISIS-2259: fixes compile issues.
---
 core-parent/pom.xml                                |  9 ++-
 extensions/pom.xml                                 | 18 -----
 legacy/extensions/core/applib/pom.xml              |  2 +-
 legacy/extensions/core/commons/pom.xml             |  2 +-
 legacy/extensions/core/metamodel/pom.xml           |  2 +-
 legacy/extensions/core/runtime/pom.xml             |  2 +-
 starters/pom.xml                                   | 16 ++++
 subdomains/xdocreport/impl/pom.xml                 |  2 +-
 subdomains/zip/impl/pom.xml                        |  2 +-
 {extensions/vw => valuetypes}/asciidoc/pom.xml     | 14 ++--
 .../asciidoc}/src/main/doc/antora.yml              |  0
 .../main/doc/modules/asciidoc}/_attributes.adoc    |  0
 .../src/main/doc/modules/asciidoc}/nav.adoc        |  0
 .../doc/modules/asciidoc/pages}/_attributes.adoc   |  0
 .../src/main/doc/modules/asciidoc/pages/about.adoc |  0
 .../modules/asciidoc/partials}/_attributes.adoc    |  0
 .../doc/modules/asciidoc/partials/module-nav.adoc  |  0
 .../applib/IsisModuleExtAsciidocApplib.java        |  0
 .../extensions/asciidoc/applib/value/AsciiDoc.java |  0
 .../asciidoc/ui/IsisModuleExtAsciidocUi.java       |  0
 .../asciidoc/ui/components/AsciiDocComponent.java  |  0
 .../AsciiDocPanelFactoriesForWicket.java           |  0
 .../asciidoc}/ui/components/css/prism.css          |  0
 .../asciidoc}/ui/components/js/prism1.14.js        |  0
 .../asciidoc/ui/converter/AsciiDocConverter.java   |  0
 {extensions/vw => valuetypes}/markdown/pom.xml     | 14 ++--
 .../markdown/src/main/doc/antora.yml               |  0
 .../src/main/doc/modules/markdown/_attributes.adoc |  0
 .../src/main/doc/modules/markdown}/nav.adoc        |  0
 .../doc/modules/markdown/pages}/_attributes.adoc   |  0
 .../src/main/doc/modules/markdown/pages/about.adoc |  0
 .../modules/markdown/partials}/_attributes.adoc    |  0
 .../doc/modules/markdown/partials/module-nav.adoc  |  0
 .../applib/IsisModuleExtMarkdownApplib.java        |  0
 .../extensions/markdown/applib/value/Markdown.java |  0
 .../markdown/ui/IsisModuleExtMarkdownUi.java       |  0
 .../markdown/ui/components/MarkdownComponent.java  |  0
 .../MarkdownPanelFactoriesForWicket.java           |  0
 .../markdown}/ui/components/css/prism.css          |  0
 .../markdown}/ui/components/js/prism1.14.js        |  0
 .../markdown/ui/converter/MarkdownConverter.java   |  0
 {extensions => valuetypes}/pom.xml                 | 94 ++++------------------
 {extensions/vw => valuetypes}/sse/pom.xml          | 14 ++--
 .../sse}/src/main/doc/antora.yml                   |  0
 .../sse/src/main/doc/modules/sse}/_attributes.adoc |  0
 .../sse/src/main/doc/modules/sse/nav.adoc          |  0
 .../main/doc/modules/sse/pages}/_attributes.adoc   |  0
 .../sse/src/main/doc/modules/sse/pages/about.adoc  |  0
 .../doc/modules/sse/partials}/_attributes.adoc     |  0
 .../main/doc/modules/sse/partials/module-nav.adoc  |  0
 .../isis/extensions/sse/IsisModuleExtSse.java      |  0
 .../isis/extensions/sse/SseMetaModelPlugin.java    |  0
 .../isis/extensions/sse/api/ServerSentEvents.java  |  0
 .../apache/isis/extensions/sse/api/SseChannel.java |  0
 .../apache/isis/extensions/sse/api/SseService.java |  0
 .../apache/isis/extensions/sse/api/SseSource.java  |  0
 .../sse/facets/SseAnnotationFacetFactory.java      |  0
 .../extensions/sse/facets/SseObserveFacet.java     |  0
 .../sse/facets/SseObserveFacetAbstract.java        |  0
 ...eObserveFacetForServerSentEventsAnnotation.java |  0
 .../extensions/sse/markup/ListeningMarkup.java     |  0
 .../sse/markup/ListeningMarkupComponent.java       |  0
 .../markup/ListeningMarkupComponent_observing.java |  0
 .../ListeningMarkupPanelFactoriesForWicket.java    |  0
 .../extensions/sse/markup/js/ObservingComponent.js |  0
 .../extensions/sse/services/SseServiceDefault.java |  0
 .../sse/webmodule/ServerSentEventsServlet.java     |  0
 .../sse/webmodule/WebModuleServerSentEvents.java   |  0
 68 files changed, 65 insertions(+), 126 deletions(-)

diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index bdf6361..26d544a 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -806,14 +806,15 @@ under the License.
 			</activation>
 			<modules>
 				<module>../core</module>
-				<module>../mavendeps</module>
-				<module>../testing</module>
 				<module>../extensions</module>
-				<module>../subdomains</module>
-				<module>../mappings</module>
 				<module>../incubator</module>
 				<module>../legacy</module>
+				<module>../mappings</module>
+				<module>../mavendeps</module>
 				<module>../starters</module>
+				<module>../subdomains</module>
+				<module>../testing</module>
+				<module>../valuetypes</module>
 			</modules>
 		</profile>
 
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7f79ec3..361169d 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -64,21 +64,11 @@
 
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-asciidoc</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
 				<artifactId>isis-extensions-exceldownload</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-markdown</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
 				<artifactId>isis-extensions-secman</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
@@ -122,11 +112,6 @@
 				<artifactId>isis-extensions-cors</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-sse</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
 
 			<!-- testing -->
 			<dependency>
@@ -148,10 +133,7 @@
 
 		<module>vro/cors</module>
 
-		<module>vw/asciidoc</module>
 		<module>vw/exceldownload</module>
-		<module>vw/markdown</module>
-		<module>vw/sse</module>
 
 	</modules>
 
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index 9e0a6dc..c08d24c 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -18,7 +18,7 @@
         <groupId>org.apache.isis.legacy</groupId>
         <artifactId>isis-legacy</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-legacy-applib</artifactId>
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 5207004..20749aa 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -18,7 +18,7 @@
         <groupId>org.apache.isis.legacy</groupId>
         <artifactId>isis-legacy</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-legacy-commons</artifactId>
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 7f64071..564f6d1 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -18,7 +18,7 @@
         <groupId>org.apache.isis.legacy</groupId>
         <artifactId>isis-legacy</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-legacy-metamodel</artifactId>
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 35294b4..240a8e1 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -18,7 +18,7 @@
         <groupId>org.apache.isis.legacy</groupId>
         <artifactId>isis-legacy</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>isis-legacy-runtime</artifactId>
diff --git a/starters/pom.xml b/starters/pom.xml
index a21bd62..1a94578 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -118,6 +118,14 @@ under the License.
 			</dependency>
 
 			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
 				<groupId>org.apache.isis.testing</groupId>
 				<artifactId>isis-testing</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
@@ -126,6 +134,14 @@ under the License.
 			</dependency>
 
 			<dependency>
+				<groupId>org.apache.isis.valuetypes</groupId>
+				<artifactId>isis-valuetypes</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
 				<groupId>com.approvaltests</groupId>
 				<artifactId>approvaltests</artifactId>
 				<version>${approvaltests.version}</version>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/impl/pom.xml
index 2705705..c359d1d 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/impl/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.subdomains</groupId>
 		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-subdomains-xdocreport-dom</artifactId>
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/impl/pom.xml
index cb9a2e0..2fcad09 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/impl/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.subdomains</groupId>
 		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-subdomains-zip-dom</artifactId>
diff --git a/extensions/vw/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
similarity index 90%
rename from extensions/vw/asciidoc/pom.xml
rename to valuetypes/asciidoc/pom.xml
index 2b6c841..dd50ae9 100644
--- a/extensions/vw/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.valuetypes</groupId>
+		<artifactId>isis-valuetypes</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-asciidoc</artifactId>
-	<name>Apache Isis Ext - Asciidoctor Bundle</name>
+	<artifactId>isis-valuetypes-asciidoc</artifactId>
+	<name>Apache Isis Val - Asciidoctor</name>
 	<description></description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.asciidoc</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/asciidoc</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/vw/sse/src/main/doc/antora.yml b/valuetypes/asciidoc/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/sse/src/main/doc/antora.yml
rename to valuetypes/asciidoc/src/main/doc/antora.yml
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/nav.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/partials/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/pages/_attributes.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc b/valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
rename to valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java b/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
rename to valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
diff --git a/extensions/vw/markdown/pom.xml b/valuetypes/markdown/pom.xml
similarity index 84%
rename from extensions/vw/markdown/pom.xml
rename to valuetypes/markdown/pom.xml
index e6abfb9..e3a879a 100644
--- a/extensions/vw/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.valuetypes</groupId>
+		<artifactId>isis-valuetypes</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-markdown</artifactId>
-	<name>Apache Isis Ext - Markdown Bundle</name>
+	<artifactId>isis-valuetypes-markdown</artifactId>
+	<name>Apache Isis Val - Markdown</name>
 	<description></description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.markdown</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/markdown</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/vw/markdown/src/main/doc/antora.yml b/valuetypes/markdown/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/antora.yml
rename to valuetypes/markdown/src/main/doc/antora.yml
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/_attributes.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/pages/about.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/pages/_attributes.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/partials/_attributes.adoc
diff --git a/extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc b/valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
rename to valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
diff --git a/extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
similarity index 100%
rename from extensions/vw/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
diff --git a/extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
similarity index 100%
rename from extensions/vw/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
rename to valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
diff --git a/extensions/pom.xml b/valuetypes/pom.xml
similarity index 62%
copy from extensions/pom.xml
copy to valuetypes/pom.xml
index 7f79ec3..d5314a8 100644
--- a/extensions/pom.xml
+++ b/valuetypes/pom.xml
@@ -21,20 +21,19 @@
 		<relativePath>../core/pom.xml</relativePath>
 	</parent>
 
-	<groupId>org.apache.isis.extensions</groupId>
-	<artifactId>isis-extensions</artifactId>
+	<groupId>org.apache.isis.valuetypes</groupId>
+	<artifactId>isis-valuetypes</artifactId>
 
-	<name>Apache Isis Extensions</name>
+	<name>Apache Isis Value types</name>
 	<description>
-        Extensions to the Apache Isis framework itself.
-		These are _not_ intended to be called by the domain logic of an Apache Isis application (see instead org.apache.isis.platform).
+        Value types for use within Apache Isis applications.
     </description>
 
 	<packaging>pom</packaging>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.valuetypes</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/valuetypes</git-plugin.propertiesDir>
 	</properties>
 
 	<build>
@@ -63,96 +62,36 @@
 		<dependencies>
 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-asciidoc</artifactId>
+				<groupId>org.apache.isis.valuetypes</groupId>
+				<artifactId>isis-valuetypes-asciidoc</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-exceldownload</artifactId>
+				<groupId>org.apache.isis.valuetypes</groupId>
+				<artifactId>isis-valuetypes-markdown</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-markdown</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-secman</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-secman-model</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-secman-encryption-jbcrypt</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-secman-persistence-jdo</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-secman-shiro-realm</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-shiro-realm-ldap</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-h2console-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-hsqldbmgr-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-cors</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-sse</artifactId>
+				<groupId>org.apache.isis.valuetypes</groupId>
+				<artifactId>isis-valuetypes-sse</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 
 			<!-- testing -->
+
 			<dependency>
 				<groupId>org.apache.isis.testing</groupId>
 				<artifactId>isis-testing-fixtures</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 
-
 		</dependencies>
 	</dependencyManagement>
 
 	<modules>
-		<module>persistence/h2console/impl</module>
-		<module>persistence/hsqldbmgr/impl</module>
-
-		<module>security/secman</module>
-		<module>security/shiro-realm-ldap</module>
-
-		<module>vro/cors</module>
-
-		<module>vw/asciidoc</module>
-		<module>vw/exceldownload</module>
-		<module>vw/markdown</module>
-		<module>vw/sse</module>
-
+		<module>asciidoc</module>
+		<module>markdown</module>
+		<module>sse</module>
 	</modules>
 
 	<profiles>
@@ -229,6 +168,7 @@
 		</profile>
 
 	</profiles>
+
 </project>
 
 
diff --git a/extensions/vw/sse/pom.xml b/valuetypes/sse/pom.xml
similarity index 82%
rename from extensions/vw/sse/pom.xml
rename to valuetypes/sse/pom.xml
index b943584..ebbfd1c 100644
--- a/extensions/vw/sse/pom.xml
+++ b/valuetypes/sse/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.valuetypes</groupId>
+		<artifactId>isis-valuetypes</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-sse</artifactId>
-	<name>Apache Isis Ext - Server Sent Events</name>
+	<artifactId>isis-valuetypes-sse</artifactId>
+	<name>Apache Isis Val - Server Sent Events</name>
 	<description></description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.sse</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/sse</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/vw/asciidoc/src/main/doc/antora.yml b/valuetypes/sse/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/antora.yml
rename to valuetypes/sse/src/main/doc/antora.yml
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/nav.adoc b/valuetypes/sse/src/main/doc/modules/sse/nav.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/nav.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/nav.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/partials/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/pages/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc b/valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/pages/about.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc
diff --git a/extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc b/valuetypes/sse/src/main/doc/modules/sse/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/asciidoc/src/main/doc/modules/asciidoc/pages/_attributes.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/partials/_attributes.adoc
diff --git a/extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc b/valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/sse/src/main/doc/modules/sse/partials/module-nav.adoc
rename to valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
diff --git a/extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
similarity index 100%
rename from extensions/vw/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
rename to valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java


[isis] 04/05: ISIS-2259; fixes up antora .yml files etc.

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

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

commit 88dd55c6724b78c1ea9a3d4c85aacdd7c8548902
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 19:11:44 2020 +0000

    ISIS-2259; fixes up antora .yml files etc.
---
 .../modules/ROOT/partials/component-nav.adoc       |  22 +---
 .../doc => antora/components/mappings}/antora.yml  |   4 +-
 .../mappings/modules/ROOT/_attributes.adoc         |   6 ++
 antora/components/mappings/modules/ROOT/nav.adoc   |   1 +
 .../mappings/modules/ROOT/pages/_attributes.adoc   |   4 +
 .../mappings/modules/ROOT/pages/about.adoc         |   6 ++
 .../modules/ROOT/partials/_attributes.adoc         |   4 +
 .../modules/ROOT/partials/component-nav.adoc       |   6 ++
 .../mappings/modules/ROOT/partials/module-nav.adoc |   3 +
 .../modules/ROOT/partials/component-nav.adoc       |   3 -
 .../components/subdomains}/antora.yml              |   4 +-
 .../subdomains/modules/ROOT/_attributes.adoc       |   6 ++
 antora/components/subdomains/modules/ROOT/nav.adoc |   1 +
 .../subdomains/modules/ROOT/pages/_attributes.adoc |   4 +
 .../subdomains/modules/ROOT/pages/about.adoc       |   6 ++
 .../modules/ROOT/partials/_attributes.adoc         |   4 +
 .../modules/ROOT/partials/component-nav.adoc       |  12 +++
 .../modules/ROOT/partials/module-nav.adoc          |   3 +
 .../components/toc/modules/ROOT/pages/about.adoc   |   8 +-
 .../{extensions-catalog.adoc => catalogs.adoc}     |  26 +++--
 .../toc/modules/ROOT/partials/module-nav.adoc      |   9 +-
 .../components/valuetypes}/antora.yml              |   4 +-
 .../valuetypes/modules/ROOT/_attributes.adoc       |   6 ++
 antora/components/valuetypes/modules/ROOT/nav.adoc |   1 +
 .../valuetypes/modules/ROOT/pages/_attributes.adoc |   4 +
 .../valuetypes/modules/ROOT/pages/about.adoc       |   6 ++
 .../modules/ROOT/partials/_attributes.adoc         |   4 +
 .../modules/ROOT/partials/component-nav.adoc       |   2 +
 .../modules/ROOT/partials/module-nav.adoc          |   3 +
 antora/supplemental-ui/index.html                  |   2 +-
 .../flywayjdo/impl/src/main/doc/antora.yml         |   2 +-
 .../doc/modules/flywayjdo/partials/module-nav.adoc |   2 +-
 .../doc/modules/h2console/partials/module-nav.adoc |   2 +-
 .../doc/modules/hsqldbmgr/partials/module-nav.adoc |   2 +-
 .../security/secman/api/src/main/doc/antora.yml    |   2 +-
 .../encryption-jbcrypt/src/main/doc/antora.yml     |   2 +-
 .../security/secman/model/src/main/doc/antora.yml  |   2 +-
 .../secman/persistence-jdo/src/main/doc/antora.yml |   2 +-
 .../secman/shiro-realm/src/main/doc/antora.yml     |   2 +-
 extensions/security/secman/src/main/doc/antora.yml |   2 +-
 .../shiro-realm-ldap/src/main/doc/antora.yml       |   2 +-
 .../shiro-realm-ldap/partials/module-nav.adoc      |   2 +-
 extensions/vro/cors/src/main/doc/antora.yml        |   2 +-
 .../vw/exceldownload/src/main/doc/antora.yml       |   2 +-
 .../modules/microprofile/partials/module-nav.adoc  |   2 +-
 .../servletapi/impl/src/main/doc/antora.yml        |   2 +-
 legacy/testing/mavenplugin/src/main/doc/antora.yml |   2 +-
 mappings/jaxrsclient/impl/src/main/doc/antora.yml  |   2 +-
 .../modules/jaxrsclient/partials/module-nav.adoc   |   2 +-
 mappings/minio/impl/src/main/doc/antora.yml        |   2 +-
 .../doc/modules/minio/partials/module-nav.adoc     |   2 +-
 mappings/restclient/impl/src/main/doc/antora.yml   |   2 +-
 .../modules/restclient/partials/module-nav.adoc    |   2 +-
 mappings/slack/impl/src/main/doc/antora.yml        |   2 +-
 .../doc/modules/slack/partials/module-nav.adoc     |   2 +-
 site-mappings.yml                                  |  45 ++++++++
 site-subdomains.yml                                |  45 ++++++++
 site-valuetypes.yml                                |  45 ++++++++
 site.yml                                           | 119 ++++++++++++---------
 subdomains/base/impl/src/main/doc/antora.yml       |   2 +-
 .../main/doc/modules/base/partials/module-nav.adoc |   2 +-
 subdomains/docx/impl/src/main/doc/antora.yml       |   2 +-
 .../main/doc/modules/docx/partials/module-nav.adoc |   2 +-
 subdomains/excel/impl/src/main/doc/antora.yml      |   2 +-
 .../doc/modules/excel/partials/module-nav.adoc     |   2 +-
 subdomains/freemarker/impl/src/main/doc/antora.yml |   2 +-
 .../modules/freemarker/partials/module-nav.adoc    |   2 +-
 subdomains/ognl/impl/src/main/doc/antora.yml       |   2 +-
 .../main/doc/modules/ognl/partials/module-nav.adoc |   2 +-
 subdomains/pdfbox/impl/src/main/doc/antora.yml     |   2 +-
 .../doc/modules/pdfbox/partials/module-nav.adoc    |   2 +-
 subdomains/spring/impl/src/main/doc/antora.yml     |   2 +-
 .../doc/modules/spring/partials/module-nav.adoc    |   2 +-
 subdomains/xdocreport/impl/src/main/doc/antora.yml |   2 +-
 .../modules/xdocreport/partials/module-nav.adoc    |   2 +-
 subdomains/zip/impl/src/main/doc/antora.yml        |   2 +-
 .../main/doc/modules/zip/partials/module-nav.adoc  |   2 +-
 valuetypes/asciidoc/src/main/doc/antora.yml        |   2 +-
 valuetypes/markdown/src/main/doc/antora.yml        |   2 +-
 valuetypes/sse/src/main/doc/antora.yml             |   2 +-
 80 files changed, 385 insertions(+), 135 deletions(-)

diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index 46a7f2f..8900c55 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,22 +1,10 @@
 include::extensions:ROOT:partial$module-nav.adoc[]
 
-// core
-include::extensions:spring:partial$module-nav.adoc[]
-
-// lib
-include::extensions:base:partial$module-nav.adoc[]
-include::extensions:docx:partial$module-nav.adoc[]
-include::extensions:excel:partial$module-nav.adoc[]
-include::extensions:freemarker:partial$module-nav.adoc[]
-include::extensions:jaxrsclient:partial$module-nav.adoc[]
-include::extensions:minio:partial$module-nav.adoc[]
-include::extensions:ognl:partial$module-nav.adoc[]
-include::extensions:pdfbox:partial$module-nav.adoc[]
-include::extensions:slack:partial$module-nav.adoc[]
-include::extensions:xdocreport:partial$module-nav.adoc[]
-include::extensions:zip:partial$module-nav.adoc[]
-
-// persistence
+* Persistence
+include::extensions:flywayjdo:partial$module-nav.adoc[]
 include::extensions:h2console:partial$module-nav.adoc[]
 include::extensions:hsqldbmgr:partial$module-nav.adoc[]
 
+* Security
+include::extensions:shiro-realm-ldap:partial$module-nav.adoc[]
+** xref:secman:ROOT:about.adoc[SecMan]
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/antora/components/mappings/antora.yml
similarity index 62%
copy from extensions/security/secman/src/main/doc/antora.yml
copy to antora/components/mappings/antora.yml
index 88ed3f2..7eb4fea 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/antora/components/mappings/antora.yml
@@ -1,5 +1,5 @@
-name: secman
-title: "SecMan"
+name: mappings
+title: "BC Mappings Catalog"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/mappings/modules/ROOT/_attributes.adoc b/antora/components/mappings/modules/ROOT/_attributes.adoc
new file mode 100644
index 0000000..43cb529
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/_attributes.adoc
@@ -0,0 +1,6 @@
+ifndef::env-site,env-github[]
+:attachmentsdir: {moduledir}/attachments
+:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
+endif::[]
diff --git a/antora/components/mappings/modules/ROOT/nav.adoc b/antora/components/mappings/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..c06de12
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::mappings:ROOT:partial$component-nav.adoc[]
diff --git a/antora/components/mappings/modules/ROOT/pages/_attributes.adoc b/antora/components/mappings/modules/ROOT/pages/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/pages/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/mappings/modules/ROOT/pages/about.adoc b/antora/components/mappings/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..3a0a974
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/pages/about.adoc
@@ -0,0 +1,6 @@
+= Mappings Catalog
+: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 [...]
+include::_attributes.adoc[]
+:page-partial:
+
+TODO
diff --git a/antora/components/mappings/modules/ROOT/partials/_attributes.adoc b/antora/components/mappings/modules/ROOT/partials/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/partials/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/mappings/modules/ROOT/partials/component-nav.adoc b/antora/components/mappings/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..db1be42
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,6 @@
+include::mappings:ROOT:partial$module-nav.adoc[]
+
+include::mappings:jaxrsclient:partial$module-nav.adoc[]
+include::mappings:minio:partial$module-nav.adoc[]
+include::mappings:restclient:partial$module-nav.adoc[]
+include::mappings:slack:partial$module-nav.adoc[]
diff --git a/antora/components/mappings/modules/ROOT/partials/module-nav.adoc b/antora/components/mappings/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/antora/components/mappings/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+
+
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index 45e6069..4733610 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -2,9 +2,6 @@ include::security:ROOT:partial$module-nav.adoc[]
 include::security:api:partial$module-nav.adoc[]
 include::security:bypass:partial$module-nav.adoc[]
 include::security:shiro:partial$module-nav.adoc[]
-include::security:shiro-realm-ldap:partial$module-nav.adoc[]
 include::security:keycloak:partial$module-nav.adoc[]
 include::security:ROOT:partial$module-nav2.adoc[]
 
-* Extensions
-** xref:secman:ROOT:about.adoc[SecMan]
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/antora/components/subdomains/antora.yml
similarity index 61%
copy from extensions/security/secman/src/main/doc/antora.yml
copy to antora/components/subdomains/antora.yml
index 88ed3f2..ec01618 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/antora/components/subdomains/antora.yml
@@ -1,5 +1,5 @@
-name: secman
-title: "SecMan"
+name: subdomains
+title: "Subdomains Catalog"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/subdomains/modules/ROOT/_attributes.adoc b/antora/components/subdomains/modules/ROOT/_attributes.adoc
new file mode 100644
index 0000000..43cb529
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/_attributes.adoc
@@ -0,0 +1,6 @@
+ifndef::env-site,env-github[]
+:attachmentsdir: {moduledir}/attachments
+:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
+endif::[]
diff --git a/antora/components/subdomains/modules/ROOT/nav.adoc b/antora/components/subdomains/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..352c9ae
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::subdomains:ROOT:partial$component-nav.adoc[]
diff --git a/antora/components/subdomains/modules/ROOT/pages/_attributes.adoc b/antora/components/subdomains/modules/ROOT/pages/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/pages/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/subdomains/modules/ROOT/pages/about.adoc b/antora/components/subdomains/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..58bc24e
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/pages/about.adoc
@@ -0,0 +1,6 @@
+= Subdomains Catalog
+: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 [...]
+include::_attributes.adoc[]
+:page-partial:
+
+TODO
diff --git a/antora/components/subdomains/modules/ROOT/partials/_attributes.adoc b/antora/components/subdomains/modules/ROOT/partials/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/partials/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/subdomains/modules/ROOT/partials/component-nav.adoc b/antora/components/subdomains/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..a98ab5d
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,12 @@
+include::subdomains:ROOT:partial$module-nav.adoc[]
+
+include::subdomains:base:partial$module-nav.adoc[]
+include::subdomains:docx:partial$module-nav.adoc[]
+include::subdomains:excel:partial$module-nav.adoc[]
+include::subdomains:freemarker:partial$module-nav.adoc[]
+include::subdomains:spring:partial$module-nav.adoc[]
+include::subdomains:ognl:partial$module-nav.adoc[]
+include::subdomains:pdfbox:partial$module-nav.adoc[]
+include::subdomains:xdocreport:partial$module-nav.adoc[]
+include::subdomains:zip:partial$module-nav.adoc[]
+
diff --git a/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc b/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+
+
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 900c86d..090ca91 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -62,7 +62,13 @@ _Persistence_
 [discrete]
 == Catalogs
 
-*  xref:extensions:ROOT:about.adoc[Extensions Catalog]
+*  xref:subdomains:ROOT:about.adoc[Subdomains]
+*  xref:valuetypes:ROOT:about.adoc[Value Types]
+*  xref:extensions:ROOT:about.adoc[Extensions]
+*  xref:mappings:ROOT:about.adoc[Mappings between Bounded Contexts]
+
+_Also:_
+
 *  xref:incubator:ROOT:about.adoc[Incubator Catalog]
 *  xref:legacy:ROOT:about.adoc[Legacy Catalog]
 
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/extensions-catalog.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
similarity index 50%
rename from antora/components/toc/modules/ROOT/pages/landing-page/extensions-catalog.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
index 11c2e7f..3571077 100644
--- a/antora/components/toc/modules/ROOT/pages/landing-page/extensions-catalog.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
@@ -1,20 +1,34 @@
-= Extensions Catalog
+= Catalogs
 :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 [...]
 include::_attributes.adoc[]
 
+Included with the framework are a number of catalogs:
 
-The framework bundles a number of extensions.
-Some are incorporated or referenced by other guides (most notably the xref:testing:ROOT:about.adoc[testing] guide, xref:security:ROOT:about.adoc[security] guide, and the xref:vw:ROOT:about.adoc[wicket viewer] guide).
+* xref:extensions:ROOT:about.adoc[Extensions Catalog]
++
+Extends the functionality of particular components of the framework itself.
+For example, the "Excel Download" allows collections to be downloaded as an Excel `.xlsx` spreadsheet.
+
+* xref:subdomains:ROOT:about.adoc[Subdomains Catalog]
++
+Libraries and utilities to be called by the domain logic of the Apache Isis application itself.
 
-The remainder can be found in the:
+* xref:valuetypes:ROOT:about.adoc[Value Types Catalog]
++
+Implementations of various value types, eg Markdown.
+Each will have an applib submodule (for use within the domain logic) as well as various extension modules to be made available to the framework itself (to teach it how to persist or render the value type).
+
+* xref:mappings:ROOT:about.adoc[Mappings Catalog]
++
+Libraries and utilities for bounded context mappings.
+In other words, tools to help integrating system together.
 
-* xref:extensions:ROOT:about.adoc[Extensions Catalog].
 
 There are two further catalogs:
 
 * xref:incubator:ROOT:about.adoc[Incubator Catalog]
 +
-Extensions that are experimental or unstable, but which may end up graduating to the extensions catalog
+Functionality that is experimental or unstable, but which may end up graduating to the extensions catalog
 
 * xref:legacy:ROOT:about.adoc[Legacy Catalog]
 +
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
index b2035b8..a37abc9 100644
--- a/antora/components/toc/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
@@ -33,9 +33,12 @@
 
 * Catalogs
 
-**  xref:extensions:ROOT:about.adoc[Extensions Catalog]
-**  xref:incubator:ROOT:about.adoc[Incubator Catalog]
-**  xref:legacy:ROOT:about.adoc[Legacy Catalog]
+**  xref:extensions:ROOT:about.adoc[Extensions]
+**  xref:subdomains:ROOT:about.adoc[Subdomains]
+**  xref:mappings:ROOT:about.adoc[Mappings for Bounded Contexts]
+**  xref:valuetypes:ROOT:about.adoc[Value Types]
+**  xref:incubator:ROOT:about.adoc[Incubator]
+**  xref:legacy:ROOT:about.adoc[Legacy]
 
 
 * Support
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/antora/components/valuetypes/antora.yml
similarity index 61%
copy from extensions/security/secman/src/main/doc/antora.yml
copy to antora/components/valuetypes/antora.yml
index 88ed3f2..2f2fc75 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/antora/components/valuetypes/antora.yml
@@ -1,5 +1,5 @@
-name: secman
-title: "SecMan"
+name: valuetypes
+title: "Value Types Catalog"
 version: master
 start_page: ROOT:about.adoc
 nav:
diff --git a/antora/components/valuetypes/modules/ROOT/_attributes.adoc b/antora/components/valuetypes/modules/ROOT/_attributes.adoc
new file mode 100644
index 0000000..43cb529
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/_attributes.adoc
@@ -0,0 +1,6 @@
+ifndef::env-site,env-github[]
+:attachmentsdir: {moduledir}/attachments
+:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
+endif::[]
diff --git a/antora/components/valuetypes/modules/ROOT/nav.adoc b/antora/components/valuetypes/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..ec97924
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::valuetypes:ROOT:partial$component-nav.adoc[]
diff --git a/antora/components/valuetypes/modules/ROOT/pages/_attributes.adoc b/antora/components/valuetypes/modules/ROOT/pages/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/pages/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/valuetypes/modules/ROOT/pages/about.adoc b/antora/components/valuetypes/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..dd049b1
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/pages/about.adoc
@@ -0,0 +1,6 @@
+= Value Types Catalog
+: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 [...]
+include::_attributes.adoc[]
+:page-partial:
+
+TODO
diff --git a/antora/components/valuetypes/modules/ROOT/partials/_attributes.adoc b/antora/components/valuetypes/modules/ROOT/partials/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/partials/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc b/antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..6d15c0f
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,2 @@
+include::valuetypes:ROOT:partial$module-nav.adoc[]
+
diff --git a/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc b/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..b28b04f
--- /dev/null
+++ b/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+
+
+
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index 180d606..274a51e 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -103,7 +103,7 @@
             <li><a href="toc/landing-page/quick-start.html">Quick Start</a></li>
             <li><a href="toc/landing-page/guides.html">Guides</a></li>
             <li><a href="toc/landing-page/components.html">Components</a></li>
-            <li><a href="toc/landing-page/extensions-catalog.html">Extensions Catalog</a></li>
+            <li><a href="toc/landing-page/catalogs.html">Catalogs</a></li>
             <li><a href="toc/landing-page/support.html">Support</a></li>
             <li><a href="toc/landing-page/releases.html">Releases</a></li>
           </ul>
diff --git a/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml b/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml
index e805b25..eeeeb1e 100644
--- a/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml
+++ b/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: pjdo
+name: extensions
 version: master
diff --git a/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/module-nav.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
index e255168..13c46d1 100644
--- a/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
+++ b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:pjdo:flywayjdo:about.adoc[Flyway for JDO]
+** xref:extensions:flywayjdo:about.adoc[Flyway for JDO]
 
 
diff --git a/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/module-nav.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/module-nav.adoc
index 02826d6..ec4345b 100644
--- a/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/module-nav.adoc
+++ b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:h2console:about.adoc[H2 Console]
+** xref:extensions:h2console:about.adoc[H2 Console]
 
 
diff --git a/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
index 847ab33..d28efd3 100644
--- a/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
+++ b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:hsqldbmgr:about.adoc[HSQLDB Manager]
+** xref:extensions:hsqldbmgr:about.adoc[HSQLDB Manager]
 
 
diff --git a/extensions/security/secman/api/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
index a6ae987..eeeeb1e 100644
--- a/extensions/security/secman/api/src/main/doc/antora.yml
+++ b/extensions/security/secman/api/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: extensions
 version: master
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
index a6ae987..eeeeb1e 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: extensions
 version: master
diff --git a/extensions/security/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
index a6ae987..eeeeb1e 100644
--- a/extensions/security/secman/model/src/main/doc/antora.yml
+++ b/extensions/security/secman/model/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: extensions
 version: master
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
index a6ae987..eeeeb1e 100644
--- a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: extensions
 version: master
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
index a6ae987..eeeeb1e 100644
--- a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
+++ b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: secman
+name: extensions
 version: master
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
index 88ed3f2..b188a2d 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/extensions/security/secman/src/main/doc/antora.yml
@@ -1,4 +1,4 @@
-name: secman
+name: extensions
 title: "SecMan"
 version: master
 start_page: ROOT:about.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
index 09a6b1a..eeeeb1e 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: security
+name: extensions
 version: master
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
index 8789cc4..86e6093 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
@@ -1 +1 @@
-* xref:security:shiro-realm-ldap:about.adoc[LDAP Realm]
\ No newline at end of file
+** xref:extensions:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
\ No newline at end of file
diff --git a/extensions/vro/cors/src/main/doc/antora.yml b/extensions/vro/cors/src/main/doc/antora.yml
index 576eb80..eeeeb1e 100644
--- a/extensions/vro/cors/src/main/doc/antora.yml
+++ b/extensions/vro/cors/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vro
+name: extensions
 version: master
diff --git a/extensions/vw/exceldownload/src/main/doc/antora.yml b/extensions/vw/exceldownload/src/main/doc/antora.yml
index cb832ae..eeeeb1e 100644
--- a/extensions/vw/exceldownload/src/main/doc/antora.yml
+++ b/extensions/vw/exceldownload/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vw
+name: extensions
 version: master
diff --git a/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
index 26d195f..82ebf0f 100644
--- a/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
+++ b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:incubator:model:about.adoc[@Model]
+* xref:incubator:microprofile:about.adoc[MicroProfile]
 
 
 
diff --git a/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml b/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
index cb832ae..0a5830f 100644
--- a/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
+++ b/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vw
+name: legacy
 version: master
diff --git a/legacy/testing/mavenplugin/src/main/doc/antora.yml b/legacy/testing/mavenplugin/src/main/doc/antora.yml
index 0d34b75..0a5830f 100644
--- a/legacy/testing/mavenplugin/src/main/doc/antora.yml
+++ b/legacy/testing/mavenplugin/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: testing
+name: legacy
 version: master
diff --git a/mappings/jaxrsclient/impl/src/main/doc/antora.yml b/mappings/jaxrsclient/impl/src/main/doc/antora.yml
index eeeeb1e..a6a9467 100644
--- a/mappings/jaxrsclient/impl/src/main/doc/antora.yml
+++ b/mappings/jaxrsclient/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: mappings
 version: master
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
index 075c629..295fc97 100644
--- a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
+++ b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:jaxrsclient:about.adoc[JAX-RS Client Library]
+* xref:mappings:jaxrsclient:about.adoc[JAX-RS Client Library]
 
 
diff --git a/mappings/minio/impl/src/main/doc/antora.yml b/mappings/minio/impl/src/main/doc/antora.yml
index eeeeb1e..a6a9467 100644
--- a/mappings/minio/impl/src/main/doc/antora.yml
+++ b/mappings/minio/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: mappings
 version: master
diff --git a/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc b/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
index 11b3f84..dd4c90b 100644
--- a/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
+++ b/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:minio:about.adoc[Minio Library]
+* xref:mappings:minio:about.adoc[Minio Library]
 
 
diff --git a/mappings/restclient/impl/src/main/doc/antora.yml b/mappings/restclient/impl/src/main/doc/antora.yml
index 576eb80..a6a9467 100644
--- a/mappings/restclient/impl/src/main/doc/antora.yml
+++ b/mappings/restclient/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vro
+name: mappings
 version: master
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
index 654b29c..24a40dd 100644
--- a/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
+++ b/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:vro:restclient:about.adoc[REST Client]
+* xref:mappings:restclient:about.adoc[REST Client]
 
 
 
diff --git a/mappings/slack/impl/src/main/doc/antora.yml b/mappings/slack/impl/src/main/doc/antora.yml
index eeeeb1e..a6a9467 100644
--- a/mappings/slack/impl/src/main/doc/antora.yml
+++ b/mappings/slack/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: mappings
 version: master
diff --git a/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc b/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
index f45e279..dad62fd 100644
--- a/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
+++ b/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:slack:about.adoc[Slack Library]
+* xref:mappings:slack:about.adoc[Slack Library]
 
 
diff --git a/site-mappings.yml b/site-mappings.yml
new file mode 100644
index 0000000..489bb56
--- /dev/null
+++ b/site-mappings.yml
@@ -0,0 +1,45 @@
+site:
+  title: Apache Isis
+  url: https://isis.apache.org/
+  start_page: toc:ROOT:about.adoc
+
+content:
+  sources:
+
+# antora
+    - url: .
+      start_path: antora/components/toc # toc
+      branches: HEAD
+
+    - url: .
+      start_path: antora/components/mappings # mappings
+      branches: HEAD
+
+
+
+ui:
+  bundle:
+    url: ../isis-antora/build/ui-bundle.zip
+#    url: https://github.com/apache/isis-antora/blob/master/build/ui-bundle.zip?raw=true
+    #url: ./antora/theme/ui-bundle.zip
+    snapshot: true
+  supplemental_files: antora/supplemental-ui
+
+asciidoc:
+  extensions:
+    - asciidoctor-plantuml
+    - ./antora/lib/lorem
+    - ./antora/lib/jira-issue
+    - ./antora/lib/powershell
+  attributes:
+    experimental: ""
+    idprefix: ""
+    idseparator: "-"
+    plantuml-server-url: "http://www.plantuml.com/plantuml"
+    isiscurr: "2.0.0-M2"
+    isisnext: "2.0.0-M3"
+    isisnextafter: "2.0.0-M4"
+    :isisdevafter: "2.0.0-M4-SNAPSHOT"
+
+output:
+  dir: antora/target/site
diff --git a/site-subdomains.yml b/site-subdomains.yml
new file mode 100644
index 0000000..b9b0b62
--- /dev/null
+++ b/site-subdomains.yml
@@ -0,0 +1,45 @@
+site:
+  title: Apache Isis
+  url: https://isis.apache.org/
+  start_page: toc:ROOT:about.adoc
+
+content:
+  sources:
+
+# antora
+    - url: .
+      start_path: antora/components/toc # toc
+      branches: HEAD
+
+    - url: .
+      start_path: antora/components/subdomains # subdomains
+      branches: HEAD
+
+
+
+ui:
+  bundle:
+    url: ../isis-antora/build/ui-bundle.zip
+#    url: https://github.com/apache/isis-antora/blob/master/build/ui-bundle.zip?raw=true
+    #url: ./antora/theme/ui-bundle.zip
+    snapshot: true
+  supplemental_files: antora/supplemental-ui
+
+asciidoc:
+  extensions:
+    - asciidoctor-plantuml
+    - ./antora/lib/lorem
+    - ./antora/lib/jira-issue
+    - ./antora/lib/powershell
+  attributes:
+    experimental: ""
+    idprefix: ""
+    idseparator: "-"
+    plantuml-server-url: "http://www.plantuml.com/plantuml"
+    isiscurr: "2.0.0-M2"
+    isisnext: "2.0.0-M3"
+    isisnextafter: "2.0.0-M4"
+    :isisdevafter: "2.0.0-M4-SNAPSHOT"
+
+output:
+  dir: antora/target/site
diff --git a/site-valuetypes.yml b/site-valuetypes.yml
new file mode 100644
index 0000000..d2a1ba2
--- /dev/null
+++ b/site-valuetypes.yml
@@ -0,0 +1,45 @@
+site:
+  title: Apache Isis
+  url: https://isis.apache.org/
+  start_page: toc:ROOT:about.adoc
+
+content:
+  sources:
+
+# antora
+    - url: .
+      start_path: antora/components/toc # toc
+      branches: HEAD
+
+    - url: .
+      start_path: antora/components/valuetypes # valuetypes
+      branches: HEAD
+
+
+
+ui:
+  bundle:
+    url: ../isis-antora/build/ui-bundle.zip
+#    url: https://github.com/apache/isis-antora/blob/master/build/ui-bundle.zip?raw=true
+    #url: ./antora/theme/ui-bundle.zip
+    snapshot: true
+  supplemental_files: antora/supplemental-ui
+
+asciidoc:
+  extensions:
+    - asciidoctor-plantuml
+    - ./antora/lib/lorem
+    - ./antora/lib/jira-issue
+    - ./antora/lib/powershell
+  attributes:
+    experimental: ""
+    idprefix: ""
+    idseparator: "-"
+    plantuml-server-url: "http://www.plantuml.com/plantuml"
+    isiscurr: "2.0.0-M2"
+    isisnext: "2.0.0-M3"
+    isisnextafter: "2.0.0-M4"
+    :isisdevafter: "2.0.0-M4-SNAPSHOT"
+
+output:
+  dir: antora/target/site
diff --git a/site.yml b/site.yml
index c2e8657..5ecaf0d 100644
--- a/site.yml
+++ b/site.yml
@@ -24,17 +24,26 @@ content:
       start_path: antora/components/legacy # legacy
       branches: HEAD
     - url: .
+      start_path: antora/components/mappings # mappings
+      branches: HEAD
+    - url: .
       start_path: antora/components/refguide # refguide
       branches: HEAD
     - url: .
       start_path: antora/components/security # security
       branches: HEAD
     - url: .
+      start_path: antora/components/subdomains # subdomains
+      branches: HEAD
+    - url: .
       start_path: antora/components/testing # testing
       branches: HEAD
     - url: .
       start_path: antora/components/userguide # userguide
       branches: HEAD
+    - url: .
+      start_path: antora/components/valuetypes # valuetypes
+      branches: HEAD
 
 # core
     - url: .
@@ -109,143 +118,149 @@ content:
       start_path: examples/smoketests/src/main/doc # core
       branches: HEAD
 
-# starters
+# extensions
     - url: .
-      start_path: starters/src/main/doc # toc
+      start_path: extensions/persistence/flywayjdo/impl/src/main/doc # extensions
       branches: HEAD
-
-# incubator
     - url: .
-      start_path: incubator/core/model/src/main/doc # incubator
+      start_path: extensions/persistence/h2console/impl/src/main/doc # extensions
       branches: HEAD
     - url: .
-      start_path: incubator/core/microprofile/src/main/doc # incubator
+      start_path: extensions/persistence/hsqldbmgr/impl/src/main/doc # extensions
       branches: HEAD
 
-# legacy
     - url: .
-      start_path: legacy/core/applib/src/main/doc # legacy
+      start_path: extensions/security/secman/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: legacy/core/commons/src/main/doc # legacy
+      start_path: extensions/security/secman/api/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: legacy/core/runtime/src/main/doc # legacy
+      start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: legacy/vro/restclient/src/main/doc # legacy
+      start_path: extensions/security/secman/model/src/main/doc # security
       branches: HEAD
-
-# extensions
     - url: .
-      start_path: extensions/core/spring/src/main/doc # extensions
+      start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
       branches: HEAD
-
     - url: .
-      start_path: extensions/lib/base/impl/src/main/doc # extensions
+      start_path: extensions/security/secman/shiro-realm/src/main/doc # security
       branches: HEAD
     - url: .
-      start_path: extensions/lib/docx/impl/src/main/doc # extensions
+      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
       branches: HEAD
+
     - url: .
-      start_path: extensions/lib/excel/impl/src/main/doc # extensions
+      start_path: extensions/vro/cors/src/main/doc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/lib/freemarker/impl/src/main/doc # extensions
+      start_path: extensions/vw/exceldownload/src/main/doc # vw
       branches: HEAD
+
+# incubator
     - url: .
-      start_path: extensions/lib/jaxrsclient/impl/src/main/doc # extensions
+      start_path: incubator/extensions/core/model/src/main/doc # incubator
       branches: HEAD
     - url: .
-      start_path: extensions/lib/minio/impl/src/main/doc # extensions
+      start_path: incubator/extensions/core/microprofile/src/main/doc # incubator
       branches: HEAD
+
+# legacy
     - url: .
-      start_path: extensions/lib/ognl/impl/src/main/doc # extensions
+      start_path: legacy/extensions/core/applib/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: extensions/lib/pdfbox/impl/src/main/doc # extensions
+      start_path: legacy/extensions/core/commons/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: extensions/lib/slack/impl/src/main/doc # extensions
+      start_path: legacy/extensions/core/runtime/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: extensions/lib/xdocreport/impl/src/main/doc # extensions
+      start_path: legacy/mappings/restclient/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: extensions/lib/zip/impl/src/main/doc # extensions
+      start_path: legacy/subdomains/servletapi/impl/src/main/doc # legacy
       branches: HEAD
 
+# mappings
     - url: .
-      start_path: extensions/persistence/flywayjdo/impl/src/main/doc # extensions
+      start_path: mappings/jaxrsclient/impl/src/main/doc # mappings
       branches: HEAD
     - url: .
-      start_path: extensions/persistence/h2console/impl/src/main/doc # extensions
+      start_path: mappings/minio/impl/src/main/doc # mappings
       branches: HEAD
     - url: .
-      start_path: extensions/persistence/hsqldbmgr/impl/src/main/doc # extensions
+      start_path: mappings/restclient/impl/src/main/doc # mappings
+      branches: HEAD
+    - url: .
+      start_path: mappings/slack/impl/src/main/doc # mappings
       branches: HEAD
 
+# mavendeps
     - url: .
-      start_path: extensions/security/secman/src/main/doc # security
+      start_path: mavendeps/src/main/doc # toc
       branches: HEAD
+
+# starters
     - url: .
-      start_path: extensions/security/secman/api/src/main/doc # security
+      start_path: starters/src/main/doc # toc
       branches: HEAD
+
+# subdomains
     - url: .
-      start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
+      start_path: subdomains/base/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/model/src/main/doc # security
+      start_path: subdomains/docx/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
+      start_path: subdomains/excel/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/shiro-realm/src/main/doc # security
+      start_path: subdomains/freemarker/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
+      start_path: subdomains/ognl/impl/src/main/doc # subdomains
       branches: HEAD
-
     - url: .
-      start_path: extensions/testing/fakedata/impl/src/main/doc # testing
+      start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/testing/fixtures/src/main/doc # testing
+      start_path: subdomains/spring/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/testing/specsupport/src/main/doc # testing
+      start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
       branches: HEAD
     - url: .
-      start_path: extensions/testing/unittestsupport/impl/src/main/doc # testing
+      start_path: subdomains/zip/impl/src/main/doc # subdomains
       branches: HEAD
 
-# extensions
+# testing
     - url: .
-      start_path: extensions/vro/cors/src/main/doc # vro
+      start_path: testing/fakedata/impl/src/main/doc # testing
       branches: HEAD
     - url: .
-      start_path: extensions/vro/restclient/src/main/doc # vro
+      start_path: testing/fixtures/src/main/doc # testing
       branches: HEAD
     - url: .
-      start_path: extensions/vw/asciidoc/src/main/doc # vw
+      start_path: testing/specsupport/src/main/doc # testing
       branches: HEAD
     - url: .
-      start_path: extensions/vw/exceldownload/src/main/doc # vw
+      start_path: testing/unittestsupport/impl/src/main/doc # testing
       branches: HEAD
+
+    # valuetypes
     - url: .
-      start_path: extensions/vw/markdown/src/main/doc # vw
+      start_path: valuetypes/asciidoc/src/main/doc # vw
       branches: HEAD
     - url: .
-      start_path: extensions/vw/sse/src/main/doc # vw
+      start_path: valuetypes/markdown/src/main/doc # vw
       branches: HEAD
-
-# mavendeps
     - url: .
-      start_path: mavendeps/src/main/doc # toc
+      start_path: valuetypes/sse/src/main/doc # vw
       branches: HEAD
 
-
 ui:
   bundle:
 #    url: ../isis-antora/build/ui-bundle.zip
diff --git a/subdomains/base/impl/src/main/doc/antora.yml b/subdomains/base/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/base/impl/src/main/doc/antora.yml
+++ b/subdomains/base/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc b/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
index d97c5d9..265f8f3 100644
--- a/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
+++ b/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:docx:about.adoc[Base Library]
+* xref:subdomains:base:about.adoc[Base Library]
 
 
diff --git a/subdomains/docx/impl/src/main/doc/antora.yml b/subdomains/docx/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/docx/impl/src/main/doc/antora.yml
+++ b/subdomains/docx/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
index e10d7c0..d66a7bd 100644
--- a/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
+++ b/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:docx:about.adoc[Docx Library]
+* xref:subdomains:docx:about.adoc[Docx Library]
 
 
diff --git a/subdomains/excel/impl/src/main/doc/antora.yml b/subdomains/excel/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/excel/impl/src/main/doc/antora.yml
+++ b/subdomains/excel/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
index 2958aaa..a87af24 100644
--- a/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
+++ b/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:excel:about.adoc[Excel Library]
+* xref:subdomains:excel:about.adoc[Excel Library]
 
 
diff --git a/subdomains/freemarker/impl/src/main/doc/antora.yml b/subdomains/freemarker/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/freemarker/impl/src/main/doc/antora.yml
+++ b/subdomains/freemarker/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
index 0586a74..b42b922 100644
--- a/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
+++ b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:freemarker:about.adoc[Freemarker Library]
+* xref:subdomains:freemarker:about.adoc[Freemarker Library]
 
 
diff --git a/subdomains/ognl/impl/src/main/doc/antora.yml b/subdomains/ognl/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/ognl/impl/src/main/doc/antora.yml
+++ b/subdomains/ognl/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
index cabde63..db2400e 100644
--- a/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
+++ b/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:ognl:about.adoc[OGNL Library]
+* xref:subdomains:ognl:about.adoc[OGNL Library]
 
 
diff --git a/subdomains/pdfbox/impl/src/main/doc/antora.yml b/subdomains/pdfbox/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/pdfbox/impl/src/main/doc/antora.yml
+++ b/subdomains/pdfbox/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
index 070b36d..c87f763 100644
--- a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
+++ b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:pdfbox:about.adoc[PDF Box Library]
+* xref:subdomains:pdfbox:about.adoc[PDF Box Library]
 
 
diff --git a/subdomains/spring/impl/src/main/doc/antora.yml b/subdomains/spring/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/spring/impl/src/main/doc/antora.yml
+++ b/subdomains/spring/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
index c74df47..6194c0d 100644
--- a/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
+++ b/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:spring:about.adoc[Spring]
+* xref:subdomains:spring:about.adoc[Spring]
 
 
diff --git a/subdomains/xdocreport/impl/src/main/doc/antora.yml b/subdomains/xdocreport/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/xdocreport/impl/src/main/doc/antora.yml
+++ b/subdomains/xdocreport/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
index 08a264f..928fcec 100644
--- a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
+++ b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:xdocreport:about.adoc[XDocReport Library]
+* xref:subdomains:xdocreport:about.adoc[XDocReport Library]
 
 
diff --git a/subdomains/zip/impl/src/main/doc/antora.yml b/subdomains/zip/impl/src/main/doc/antora.yml
index eeeeb1e..9811d3c 100644
--- a/subdomains/zip/impl/src/main/doc/antora.yml
+++ b/subdomains/zip/impl/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: subdomains
 version: master
diff --git a/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
index ae9c8a2..d2db3e5 100644
--- a/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
+++ b/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:zip:about.adoc[Zip Library]
+* xref:subdomains:zip:about.adoc[Zip Library]
 
 
diff --git a/valuetypes/asciidoc/src/main/doc/antora.yml b/valuetypes/asciidoc/src/main/doc/antora.yml
index cb832ae..cc4df21 100644
--- a/valuetypes/asciidoc/src/main/doc/antora.yml
+++ b/valuetypes/asciidoc/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vw
+name: valuetypes
 version: master
diff --git a/valuetypes/markdown/src/main/doc/antora.yml b/valuetypes/markdown/src/main/doc/antora.yml
index cb832ae..cc4df21 100644
--- a/valuetypes/markdown/src/main/doc/antora.yml
+++ b/valuetypes/markdown/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vw
+name: valuetypes
 version: master
diff --git a/valuetypes/sse/src/main/doc/antora.yml b/valuetypes/sse/src/main/doc/antora.yml
index cb832ae..cc4df21 100644
--- a/valuetypes/sse/src/main/doc/antora.yml
+++ b/valuetypes/sse/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: vw
+name: valuetypes
 version: master


[isis] 02/05: ISIS-2259: wip - splits out 'extensions' into 'mappings', 'subdomains', 'testing' as well as 'extensions'

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

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

commit 474377c9c32b40be876d67bfff0c0a97a6e8c316
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 17:37:06 2020 +0000

    ISIS-2259: wip - splits out 'extensions' into 'mappings', 'subdomains', 'testing' as well as 'extensions'
    
    ... and for 'incubator' and 'legacy', introduce subdirectories of mappings | extensions | subdomains | testing  for when promote / deprecate.
---
 core-parent/pom.xml                                |   3 +
 examples/smoketests/pom.xml                        |   8 +-
 .../testdomain/conf/Configuration_headless.java    |   2 +-
 extensions/lib/jaxrsclient/impl/pom.xml            |  37 ----
 .../jaxrsclient/dom/IsisModuleExtJaxRsClient.java  |  28 ---
 extensions/pom.xml                                 | 109 +----------
 extensions/security/secman/persistence-jdo/pom.xml |   4 +-
 incubator/{ => extensions}/core/jsr303/README.adoc |   0
 incubator/{ => extensions}/core/jsr303/pom.xml     |   0
 .../examples/facets/jsr303/Jsr303FacetFactory.java |   0
 .../facets/jsr303/Jsr303ProgModelFacets.java       |   0
 .../jsr303/Jsr303PropertyValidationFacet.java      |   0
 .../examples/facets/jsr303/CustomPattern.java      |   0
 .../facets/jsr303/CustomPatternValidator.java      |   0
 .../examples/facets/jsr303/CustomPatterns.java     |   0
 .../facets/jsr303/DomainObjectVanilla.java         |   0
 .../jsr303/DomainObjectWithBuiltInValidation.java  |   0
 .../jsr303/DomainObjectWithCustomValidation.java   |   0
 .../facets/jsr303/Jsr303FacetFacetHolder.java      |   0
 .../jsr303/Jsr303FacetFactoryFeatureTypes.java     |   0
 .../jsr303/Jsr303FacetFactoryInstantiation.java    |   0
 .../jsr303/Jsr303FacetFactoryProcessObject.java    |   0
 .../jsr303/Jsr303FacetFactoryProcessProperty.java  |   0
 .../facets/jsr303/Jsr303FacetInstantiation.java    |   0
 .../jsr303/Jsr303FacetValidatingInteraction.java   |   0
 .../{ => extensions}/core/microprofile/pom.xml     |   2 +-
 .../core/microprofile}/src/main/doc/antora.yml     |   0
 .../doc/modules/microprofile}/_attributes.adoc     |   0
 .../src/main/doc/modules/microprofile}/nav.adoc    |   0
 .../modules/microprofile/pages}/_attributes.adoc   |   0
 .../main/doc/modules/microprofile/pages/about.adoc |   0
 .../microprofile/partials}/_attributes.adoc        |   0
 .../modules/microprofile}/partials/module-nav.adoc |   0
 .../jee_support/IsisCDIBeanScanInterceptor.java    |   0
 .../services/javax.enterprise.inject.spi.Extension |   0
 incubator/{ => extensions}/core/model/pom.xml      |   2 +-
 .../core/model}/src/main/doc/antora.yml            |   0
 .../src/main/doc/modules/model}/_attributes.adoc   |   0
 .../model/src/main/doc/modules/model}/nav.adoc     |   0
 .../main/doc/modules/model/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/model/pages/about.adoc    |   0
 .../doc/modules/model/partials}/_attributes.adoc   |   0
 .../doc/modules/model}/partials/module-nav.adoc    |   0
 .../model/applib/IsisModuleIncModelApplib.java     |   0
 .../incubator/model/applib/annotation/Model.java   |   0
 .../metamodel/IsisModuleIncModelMetaModel.java     |   0
 .../SupportingMethodValidatorRefinerFactory.java   |   0
 .../services/IncubatorMetaModelPlugin.java         |   0
 incubator/pom.xml                                  |  14 +-
 .../runtime => extensions/core/applib}/.gitignore  |   0
 legacy/{ => extensions}/core/applib/pom.xml        |   0
 .../core/applib}/src/main/doc/antora.yml           |   0
 .../src/main/doc/modules/applib}/_attributes.adoc  |   0
 .../applib/src/main/doc/modules/applib}/nav.adoc   |   0
 .../doc/modules/applib/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/applib/pages/about.adoc   |   0
 .../doc/modules/applib/partials}/_attributes.adoc  |   0
 .../doc/modules/applib/partials/module-nav.adoc    |   0
 .../isis/legacy/applib/DomainObjectContainer.java  |   0
 .../apache/isis/legacy/applib/filter/Filter.java   |   0
 .../apache/isis/legacy/applib/filter/Filters.java  |   0
 .../background/BackgroundCommandService2.java      |   0
 .../services/background/BackgroundService.java     |   0
 .../services/background/BackgroundService2.java    |   0
 .../services/eventbus/ActionDomainEvent.java       |   0
 .../services/eventbus/CollectionDomainEvent.java   |   0
 .../services/eventbus/PropertyDomainEvent.java     |   0
 .../org/apache/isis/legacy/applib/value/Color.java |   0
 .../apache/isis/legacy/applib/value/Magnitude.java |   0
 .../org/apache/isis/legacy/applib/value/Money.java |   0
 .../isis/legacy/applib/value/Percentage.java       |   0
 .../apache/isis/legacy/applib/value/ColorTest.java |   0
 .../apache/isis/legacy/applib/value/MoneyTest.java |   0
 .../isis/legacy/applib/value/PercentageTest.java   |   0
 .../core/commons}/.gitignore                       |   0
 legacy/{ => extensions}/core/commons/pom.xml       |   0
 .../core/commons}/src/main/doc/antora.yml          |   0
 .../src/main/doc/modules/commons/_attributes.adoc  |   0
 .../commons/src/main/doc/modules/commons}/nav.adoc |   0
 .../doc/modules/commons/pages}/_attributes.adoc    |   0
 .../src/main/doc/modules/commons/pages/about.adoc  |   0
 .../doc/modules/commons/partials}/_attributes.adoc |   0
 .../doc/modules/commons/partials/module-nav.adoc   |   0
 .../FutureWithIndexIntoFutureOfList.java           |   0
 .../threadpool/ThreadPoolExecutionMode.java        |   0
 .../internal/threadpool/ThreadPoolSizeAdvisor.java |   0
 .../internal/threadpool/ThreadPoolSupport.java     |   0
 .../internal/threadpool/ThreadPoolSupportTest.java |   0
 .../core/metamodel}/.gitignore                     |   0
 legacy/{ => extensions}/core/metamodel/pom.xml     |   0
 .../facets/value/color/ColorValueFacet.java        |   0
 ...lorValueFacetUsingSemanticsProviderFactory.java |   0
 .../value/color/ColorValueSemanticsProvider.java   |   0
 .../facets/value/money/MoneyValueFacet.java        |   0
 ...neyValueFacetUsingSemanticsProviderFactory.java |   0
 .../value/money/MoneyValueSemanticsProvider.java   |   0
 ...ageValueFacetUsingSemanticsProviderFactory.java |   0
 .../PercentageValueSemanticsProvider.java          |   0
 .../value/ColorValueSemanticsProviderTest.java     |   0
 .../value/MoneyValueSemanticsProviderTest.java     |   0
 .../PercentageValueSemanticsProviderTest.java      |   0
 .../PolishMoneyValueSemanticsProviderTest.java     |   0
 .../applib => extensions/core/runtime}/.gitignore  |   0
 legacy/{ => extensions}/core/runtime/pom.xml       |   0
 .../core/runtime}/src/main/doc/antora.yml          |   0
 .../src/main/doc/modules/runtime}/_attributes.adoc |   0
 .../runtime/src/main/doc/modules/runtime}/nav.adoc |   0
 .../doc/modules/runtime/pages}/_attributes.adoc    |   0
 .../src/main/doc/modules/runtime/pages/about.adoc  |   0
 .../doc/modules/runtime/partials}/_attributes.adoc |   0
 .../doc/modules/runtime/partials/module-nav.adoc   |   0
 .../datanucleus/valuetypes/IsisMoneyMapping.java   |   0
 .../legacy/runtime/snapshot/DomSerializer.java     |   0
 .../legacy/runtime/snapshot/DomSerializerJaxp.java |   0
 .../isis/legacy/runtime/sysout/SystemPrinter.java  |   0
 .../system/persistence/LoggingLocation.java        |   0
 .../runtime/system/persistence/ObjectFactory.java  |   0
 .../system/persistence/SuspendableListener.java    |   0
 .../viewer/web/AbstractServletOrFilterMapping.java |   0
 .../runtime/viewer/web/FilterSpecification.java    |   0
 .../runtime/viewer/web/ServletSpecification.java   |   0
 .../runtime/viewer/web/WebAppSpecification.java    |   0
 .../scalars/isisapplib/IsisColorPanel.java         |   0
 .../scalars/isisapplib/IsisColorPanelFactory.java  |   0
 .../scalars/isisapplib/IsisMoneyPanel.java         |   0
 .../scalars/isisapplib/IsisMoneyPanelFactory.java  |   0
 .../scalars/isisapplib/IsisPercentagePanel.java    |   0
 .../isisapplib/IsisPercentagePanelFactory.java     |   0
 legacy/{vro => mappings}/restclient/pom.xml        |   0
 .../restclient}/src/main/doc/antora.yml            |   0
 .../main/doc/modules/restclient}/_attributes.adoc  |   0
 .../src/main/doc/modules/restclient}/nav.adoc      |   0
 .../doc/modules/restclient/pages}/_attributes.adoc |   0
 .../main/doc/modules/restclient/pages/about.adoc   |   0
 .../modules/restclient/partials}/_attributes.adoc  |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../legacy/restclient/ClientRequestFactory.java    |   0
 .../legacy/restclient/RepresentationWalker.java    |   0
 .../isis/legacy/restclient/RestEasyLegacy.java     |   0
 .../isis/legacy/restclient/RestfulClient.java      |   0
 .../legacy/restclient/RestfulClientException.java  |   0
 .../isis/legacy/restclient/lib/ClientExecutor.java |   0
 .../isis/legacy/restclient/lib/ClientRequest.java  |   0
 .../restclient/lib/ClientRequestConfigurer.java    |   0
 .../restclient/lib/RestfulHttpMethodHelper.java    |   0
 .../lib/RestfulHttpMethodTest_setUp.java           |   0
 legacy/pom.xml                                     |  18 +-
 .../subdomains/servletapi}/impl/pom.xml            |  14 +-
 .../servletapi/impl/src/main/doc/antora.yml        |   0
 .../main/doc/modules/servletapi}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/servletapi/nav.adoc  |   0
 .../doc/modules/servletapi/pages}/_attributes.adoc |   0
 .../main/doc/modules/servletapi/pages/about.adoc   |   0
 .../modules/servletapi/partials}/_attributes.adoc  |   0
 .../modules/servletapi/partials/module-nav.adoc    |   0
 .../servletapi/dom/IsisModuleSubServletApi.java    |   4 +-
 .../{testsupport => testing}/mavenplugin/pom.xml   |   0
 .../mavenplugin/src/main/doc/antora.yml            |   0
 .../src/main/doc/modules/mvn}/_attributes.adoc     |   0
 .../src/main/doc/modules/mvn/attachments}/.gitkeep |   0
 .../src/main/doc/modules/mvn/examples}/.gitkeep    |   0
 .../modules/mvn/images/maven-plugin/xsd-goal.png   | Bin
 .../modules/mvn/images/maven-plugin/xsd-goal.pptx  | Bin
 .../mavenplugin/src/main/doc/modules/mvn/nav.adoc  |   0
 .../main/doc/modules/mvn/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/mvn/pages/about.adoc      |   0
 .../src/main/doc/modules/mvn/pages/intro.adoc      |   0
 .../src/main/doc/modules/mvn/pages/swagger.adoc    |   0
 .../src/main/doc/modules/mvn/pages/validate.adoc   |   0
 .../src/main/doc/modules/mvn/pages/xsd.adoc        |   0
 .../doc/modules/mvn/partials}/_attributes.adoc     |   0
 .../src/main/doc/modules/mvn/partials/nav.adoc     |   0
 .../apache/isis/mavenplugin/IsisMojoAbstract.java  |   0
 .../apache/isis/mavenplugin/IsisMojoSwagger.java   |   0
 .../apache/isis/mavenplugin/IsisMojoValidate.java  |   0
 .../org/apache/isis/mavenplugin/IsisMojoXsd.java   |   0
 .../isis/mavenplugin/MetaModelProcessor.java       |   0
 .../IsisMavenPlugin_SpringContextConfig.java       |   0
 .../IsisMavenPlugin_SpringContextLauncher.java     |   0
 .../jaxrsclient}/impl/pom.xml                      |  15 +-
 .../jaxrsclient}/impl/src/main/doc/antora.yml      |   0
 .../main/doc/modules/jaxrsclient}/_attributes.adoc |   0
 .../src/main/doc/modules/jaxrsclient}/nav.adoc     |   0
 .../modules/jaxrsclient/pages}/_attributes.adoc    |   0
 .../main/doc/modules/jaxrsclient/pages/about.adoc  |   0
 .../modules/jaxrsclient/partials}/_attributes.adoc |   0
 .../modules/jaxrsclient/partials/module-nav.adoc   |   0
 .../jaxrsclient/dom/IsisModuleExtJaxRsClient.java  |   0
 {extensions/lib => mappings}/minio/impl/pom.xml    |  12 +-
 .../minio}/impl/src/main/doc/antora.yml            |   0
 .../src/main/doc/modules/minio}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/minio}/nav.adoc      |   0
 .../main/doc/modules/minio/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/minio/pages/about.adoc    |   0
 .../doc/modules/minio/partials}/_attributes.adoc   |   0
 .../doc/modules/minio/partials/module-nav.adoc     |   0
 mappings/pom.xml                                   | 162 ++++++++++++++++
 .../restclient/impl}/pom.xml                       |  10 +-
 .../restclient/impl}/src/main/doc/antora.yml       |   0
 .../main/doc/modules/restclient}/_attributes.adoc  |   0
 .../impl}/src/main/doc/modules/restclient/nav.adoc |   0
 .../doc/modules/restclient/pages}/_attributes.adoc |   0
 .../main/doc/modules/restclient/pages/about.adoc   |   0
 .../modules/restclient/partials}/_attributes.adoc  |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../restclient/ActionParameterListBuilder.java     |   0
 .../restclient/IsisModuleExtRestClient.java        |   0
 .../isis/extensions/restclient/ResponseDigest.java |   0
 .../isis/extensions/restclient/RestfulClient.java  |   0
 .../extensions/restclient/RestfulClientConfig.java |   0
 .../restclient/RestfulClientException.java         |   0
 .../isis/extensions/restclient/ScalarValueDto.java |   0
 .../restclient/auth/BasicAuthFilter.java           |   0
 .../restclient/log/RestfulLoggingFilter.java       |   0
 {extensions/lib => mappings}/slack/impl/pom.xml    |  12 +-
 .../slack/impl/src/main/doc/antora.yml             |   0
 .../src/main/doc/modules/slack}/_attributes.adoc   |   0
 .../slack/impl/src/main/doc/modules/slack/nav.adoc |   0
 .../main/doc/modules/slack/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/slack/pages/about.adoc    |   0
 .../doc/modules/slack/partials}/_attributes.adoc   |   0
 .../doc/modules/slack/partials/module-nav.adoc     |   0
 .../extensions/slack/dom/IsisModuleExtSlack.java   |   0
 starters/pom.xml                                   |  32 ++++
 {extensions/lib => subdomains}/base/impl/pom.xml   |  16 +-
 .../base}/impl/src/main/doc/antora.yml             |   0
 .../src/main/doc/modules/base}/_attributes.adoc    |   0
 .../base/impl/src/main/doc/modules/base}/nav.adoc  |   0
 .../main/doc/modules/base/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/base/pages/about.adoc     |   0
 .../doc/modules/base/partials}/_attributes.adoc    |   0
 .../main/doc/modules/base/partials/module-nav.adoc |   0
 .../apache/isis/extensions/base/dom/Chained.java   |   0
 .../org/apache/isis/extensions/base/dom/Dflt.java  |   0
 .../extensions/base/dom/IsisModuleExtBase.java     |   0
 .../apache/isis/extensions/base/dom/PowerType.java |   0
 .../apache/isis/extensions/base/dom/Titled.java    |   0
 .../isis/extensions/base/dom/TitledEnum.java       |   0
 .../base/dom/services/BaseServicesModule.java      |   0
 .../dom/services/calendar/CalendarService.java     |   0
 .../extensions/base/dom/types/DescriptionType.java |   0
 .../isis/extensions/base/dom/types/FqcnType.java   |   0
 .../isis/extensions/base/dom/types/MoneyType.java  |   0
 .../isis/extensions/base/dom/types/NameType.java   |   0
 .../isis/extensions/base/dom/types/NotesType.java  |   0
 .../base/dom/types/ObjectIdentifierType.java       |   0
 .../extensions/base/dom/types/PercentageType.java  |   0
 .../extensions/base/dom/types/ProperNameType.java  |   0
 .../extensions/base/dom/types/ReferenceType.java   |   0
 .../isis/extensions/base/dom/types/TitleType.java  |   0
 .../extensions/base/dom/types/UrlTemplateType.java |   0
 .../extensions/base/dom/types/UserNameType.java    |   0
 .../isis/extensions/base/dom/types/XxxType.java    |   0
 .../isis/extensions/base/dom/utils/ClassUtils.java |   0
 .../extensions/base/dom/utils/JodaPeriodUtils.java |   0
 .../isis/extensions/base/dom/utils/MathUtils.java  |   0
 .../extensions/base/dom/utils/MessageUtils.java    |   0
 .../extensions/base/dom/utils/StringUtils.java     |   0
 .../extensions/base/dom/utils/TitleBuilder.java    |   0
 .../base/dom/valuetypes/AbstractInterval.java      |   0
 .../base/dom/valuetypes/LocalDateInterval.java     |   0
 .../isis/extensions/base/dom/valuetypes/VT.java    |   0
 .../base/dom/with/WithCodeComparable.java          |   0
 .../extensions/base/dom/with/WithCodeGetter.java   |   0
 .../extensions/base/dom/with/WithCodeUnique.java   |   0
 .../base/dom/with/WithDescriptionComparable.java   |   0
 .../base/dom/with/WithDescriptionGetter.java       |   0
 .../base/dom/with/WithDescriptionUnique.java       |   0
 .../extensions/base/dom/with/WithInterval.java     |   0
 .../base/dom/with/WithIntervalContiguous.java      |   0
 .../base/dom/with/WithIntervalMutable.java         |   0
 .../base/dom/with/WithNameComparable.java          |   0
 .../extensions/base/dom/with/WithNameGetter.java   |   0
 .../extensions/base/dom/with/WithNameUnique.java   |   0
 .../base/dom/with/WithReferenceComparable.java     |   0
 .../base/dom/with/WithReferenceGetter.java         |   0
 .../base/dom/with/WithReferenceUnique.java         |   0
 .../extensions/base/dom/with/WithSequence.java     |   0
 .../extensions/base/dom/with/WithStartDate.java    |   0
 .../base/dom/with/WithTitleComparable.java         |   0
 .../extensions/base/dom/with/WithTitleGetter.java  |   0
 .../extensions/base/dom/with/WithTitleUnique.java  |   0
 .../dom/TitledEnumContractTestAbstract_title.java  |   0
 .../base/dom/TitledEnumContractTester.java         |   0
 .../extensions/base/dom/matchers/IsisMatchers.java |   0
 .../CalendarServiceTest_beginningOfMonth.java      |   0
 .../CalendarServiceTest_beginningOfQuarter.java    |   0
 .../base/dom/testing/PrivateConstructorTester.java |   0
 .../TitledEnumContractTestAbstract_title.java      |   0
 .../base/dom/titled/TitledEnumContractTester.java  |   0
 .../extensions/base/dom/utils/ClassUtilsTest.java  |   0
 .../base/dom/utils/JodaPeriodUtilsTest.java        |   0
 .../extensions/base/dom/utils/MathUtilsTest.java   |   0
 .../base/dom/utils/MessageUtils_Test.java          |   0
 .../extensions/base/dom/utils/StringUtilsTest.java |   0
 .../base/dom/utils/TitleBuilderTest.java           |   0
 .../base/dom/valuetypes/LocalDateIntervalTest.java |   0
 ...arableByCodeContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByCodeContractTester.java   |   0
 ...yDescriptionContractTestAbstract_compareTo.java |   0
 .../ComparableByDescriptionContractTester.java     |   0
 ...arableByNameContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByNameContractTester.java   |   0
 ...eByReferenceContractTestAbstract_compareTo.java |   0
 .../with/ComparableByReferenceContractTester.java  |   0
 ...rableByTitleContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByTitleContractTester.java  |   0
 .../dom/with/InstantiatorForComparableByCode.java  |   0
 .../InstantiatorForComparableByDescription.java    |   0
 .../dom/with/InstantiatorForComparableByName.java  |   0
 .../with/InstantiatorForComparableByReference.java |   0
 .../dom/with/InstantiatorForWithStartDate.java     |   0
 ...lperClassesContractTest_privateConstructor.java |   0
 .../WithFieldUniqueContractTestAllAbstract.java    |   0
 ...valMutableContractTestAbstract_changeDates.java |   0
 ...arableByCodeContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByCodeContractTester.java   |   0
 ...yDescriptionContractTestAbstract_compareTo.java |   0
 .../ComparableByDescriptionContractTester.java     |   0
 ...arableByNameContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByNameContractTester.java   |   0
 ...eByReferenceContractTestAbstract_compareTo.java |   0
 .../with/ComparableByReferenceContractTester.java  |   0
 ...rableByTitleContractTestAbstract_compareTo.java |   0
 .../dom/with/ComparableByTitleContractTester.java  |   0
 .../dom/with/InstantiatorForComparableByCode.java  |   0
 .../InstantiatorForComparableByDescription.java    |   0
 .../dom/with/InstantiatorForComparableByName.java  |   0
 .../with/InstantiatorForComparableByReference.java |   0
 .../dom/with/InstantiatorForWithStartDate.java     |   0
 .../WithFieldUniqueContractTestAllAbstract.java    |   0
 ...valMutableContractTestAbstract_changeDates.java |   0
 {extensions/lib => subdomains}/docx/impl/pom.xml   |  14 +-
 .../docx}/impl/src/main/doc/antora.yml             |   0
 .../src/main/doc/modules/docx}/_attributes.adoc    |   0
 .../docx/impl/src/main/doc/modules/docx}/nav.adoc  |   0
 .../main/doc/modules/docx/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/docx/pages/about.adoc     |   0
 .../doc/modules/docx/partials}/_attributes.adoc    |   0
 .../main/doc/modules/docx/partials/module-nav.adoc |   0
 .../extensions/docx/dom/IsisModuleExtDocx.java     |   0
 .../excel}/fixture/.gitignore                      |   0
 .../excel}/fixture/logging-dn-enhance.properties   |   0
 .../lib => subdomains}/excel/fixture/pom.xml       |  26 +--
 .../fixture/src/main/java/META-INF/persistence.xml |   0
 .../excel/fixtures/ExcelFixturesModule.java        |   0
 .../contributions/ExcelDemoToDoItem_export.java    |   0
 .../contributions/ExcelDemoToDoItem_export2.java   |   0
 .../BulkUpdateLineItemForDemoToDoItem.java         |   0
 .../BulkUpdateLineItemForDemoToDoItem.layout.xml   |   0
 .../BulkUpdateManagerForDemoToDoItem.java          |   0
 .../BulkUpdateManagerForDemoToDoItem.layout.xml    |   0
 .../bulkupdate/BulkUpdateMenuForDemoToDoItem.java  |   0
 .../pivot/ExcelPivotByCategoryAndSubcategory.java  |   0
 .../ExcelPivotByCategoryAndSubcategoryMenu.java    |   0
 .../demotodoitem/DemoToDoItemRowHandler.java       |   0
 .../demotodoitem/DemoToDoItemRowHandler2.java      |   0
 .../ExcelUploadRowHandler4ToDoItem.java            |   0
 .../ExcelUploadServiceForDemoToDoItem.java         |   0
 .../DemoFixture_extending_ExcelFixture2.java       |   0
 .../DemoToDoItem_create_usingExcelFixture.java     |   0
 .../DemoToDoItem_recreate_usingExcelFixture.java   |   0
 .../demomodule/fixturescripts/MoreToDoItems.xlsx   | Bin
 .../demomodule/fixturescripts/ToDoItems.xlsx       | Bin
 .../fixtures/demoapp/todomodule/dom/Category.java  |   0
 .../todomodule/dom/DependenciesComparator.java     |   0
 .../todomodule/dom/ExcelDemoToDoItem-done.png      | Bin
 .../todomodule/dom/ExcelDemoToDoItem-todo.png      | Bin
 .../demoapp/todomodule/dom/ExcelDemoToDoItem.java  |   0
 .../todomodule/dom/ExcelDemoToDoItem.layout.xml    |   0
 .../demoapp/todomodule/dom/ExcelDemoToDoItem.png   | Bin
 .../todomodule/dom/ExcelDemoToDoItemMenu.java      |   0
 .../demoapp/todomodule/dom/Subcategory.java        |   0
 .../ExcelDemoToDoItem_recreate5_for.java           |   0
 .../ExcelDemoToDoItem_recreate5_forSven.java       |   0
 .../fixturescripts/ExcelDemoToDoItem_tearDown.java |   0
 .../ExcelDemoToDoItem_tearDown2.java               |   0
 {extensions/lib => subdomains}/excel/impl/pom.xml  |  18 +-
 .../excel}/impl/src/main/doc/antora.yml            |   0
 .../src/main/doc/modules/excel}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/excel}/nav.adoc      |   0
 .../main/doc/modules/excel/pages}/_attributes.adoc |   0
 .../src/main/doc/modules/excel/pages/about.adoc    |   0
 .../doc/modules/excel/partials}/_attributes.adoc   |   0
 .../doc/modules/excel/partials/module-nav.adoc     |   0
 .../isis/extensions/excel/IsisModuleExtExcel.java  |   0
 .../isis/extensions/excel/dom/AggregationType.java |   0
 .../isis/extensions/excel/dom/ExcelFixture.java    |   0
 .../isis/extensions/excel/dom/ExcelFixture2.java   |   0
 .../excel/dom/ExcelFixtureRowHandler.java          |   0
 .../excel/dom/ExcelFixtureWorkbookHandler.java     |   0
 .../extensions/excel/dom/ExcelMetaDataEnabled.java |   0
 .../isis/extensions/excel/dom/ExcelService.java    |   0
 .../excel/dom/FixtureAwareRowHandler.java          |   0
 .../isis/extensions/excel/dom/HyperLink.java       |   0
 .../isis/extensions/excel/dom/PivotColumn.java     |   0
 .../isis/extensions/excel/dom/PivotDecoration.java |   0
 .../apache/isis/extensions/excel/dom/PivotRow.java |   0
 .../isis/extensions/excel/dom/PivotValue.java      |   0
 .../isis/extensions/excel/dom/RowHandler.java      |   0
 .../extensions/excel/dom/WorksheetContent.java     |   0
 .../isis/extensions/excel/dom/WorksheetSpec.java   |   0
 .../extensions/excel/dom/util/AnnotationList.java  |   0
 .../excel/dom/util/AnnotationTriplet.java          |   0
 .../extensions/excel/dom/util/CellMarshaller.java  |   0
 .../extensions/excel/dom/util/ExcelConverter.java  |   0
 .../excel/dom/util/ExcelFileBlobConverter.java     |   0
 .../excel/dom/util/ExcelServiceImpl.java           |   0
 .../isis/extensions/excel/dom/util/Mode.java       |   0
 .../isis/extensions/excel/dom/util/PivotUtils.java |   0
 .../extensions/excel/dom/util/SheetPivoter.java    |   0
 .../excel/dom/util/AnnotationListTest.java         |   0
 .../excel/dom/util/AnnotationTripletTest.java      |   0
 .../extensions/excel/dom/util/PivotUtilsTest.java  |   0
 .../excel/dom/util/SheetPivoterTest.java           |   0
 .../excel}/integtests/log4j2-test.xml              |   0
 .../lib => subdomains}/excel/integtests/pom.xml    |  26 +--
 .../integtests/ExcelModuleIntegTestAbstract.java   |   0
 .../ExcelModuleDemoMetaDataEnabled_IntegTest.java  |   0
 ...uleDemoToDoItemBulkUpdateManager_IntegTest.java |   0
 .../ExcelModuleDemoUploadService_IntegTest.java    |   0
 .../tests/ToDoItemsWithMultipleSheets.xlsx         | Bin
 .../excel/integtests/tests/toDoItems-expected.xlsx | Bin
 .../excel/integtests/tests/toDoItems-updated.xlsx  | Bin
 .../excel}/integtests/toDoItems-actual.xlsx        | Bin
 .../excel/integtests/translations.pot              |   0
 .../lib => subdomains}/freemarker/impl/pom.xml     |  12 +-
 .../freemarker}/impl/src/main/doc/antora.yml       |   0
 .../main/doc/modules/freemarker}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/freemarker}/nav.adoc |   0
 .../doc/modules/freemarker/pages}/_attributes.adoc |   0
 .../main/doc/modules/freemarker/pages/about.adoc   |   0
 .../modules/freemarker/partials}/_attributes.adoc  |   0
 .../modules/freemarker/partials/module-nav.adoc    |   0
 .../freemarker/dom/IsisModuleExtFreemarker.java    |   0
 {extensions/lib => subdomains}/ognl/impl/pom.xml   |  12 +-
 .../ognl}/impl/src/main/doc/antora.yml             |   0
 .../src/main/doc/modules/ognl}/_attributes.adoc    |   0
 .../ognl/impl/src/main/doc/modules/ognl}/nav.adoc  |   0
 .../main/doc/modules/ognl/pages}/_attributes.adoc  |   0
 .../src/main/doc/modules/ognl/pages/about.adoc     |   0
 .../doc/modules/ognl/partials}/_attributes.adoc    |   0
 .../main/doc/modules/ognl/partials/module-nav.adoc |   0
 .../extensions/ognl/dom/IsisModuleExtOgnl.java     |   0
 {extensions/lib => subdomains}/pdfbox/impl/pom.xml |  12 +-
 .../pdfbox}/impl/src/main/doc/antora.yml           |   0
 .../src/main/doc/modules/pdfbox}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/pdfbox}/nav.adoc     |   0
 .../doc/modules/pdfbox/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/pdfbox/pages/about.adoc   |   0
 .../doc/modules/pdfbox/partials}/_attributes.adoc  |   0
 .../doc/modules/pdfbox/partials/module-nav.adoc    |   0
 .../extensions/pdfbox/dom/IsisModuleExtPdfBox.java |   0
 subdomains/pom.xml                                 | 206 +++++++++++++++++++++
 .../core/spring => subdomains/spring/impl}/pom.xml |  14 +-
 .../spring}/impl/src/main/doc/antora.yml           |   0
 .../src/main/doc/modules/spring}/_attributes.adoc  |   0
 .../impl}/src/main/doc/modules/spring/nav.adoc     |   0
 .../doc/modules/spring/pages}/_attributes.adoc     |   0
 .../src/main/doc/modules/spring/pages/about.adoc   |   0
 .../doc/modules/spring/partials}/_attributes.adoc  |   0
 .../doc/modules/spring/partials/module-nav.adoc    |   0
 .../extensions/spring/IsisModuleExtSpring.java     |   0
 .../extensions/spring/service/BeanDescriptor.java  |   0
 .../extensions/spring/service/ContextBeans.java    |   0
 .../spring/service/SpringBeansService.java         |   0
 .../lib => subdomains}/xdocreport/impl/pom.xml     |  12 +-
 .../xdocreport}/impl/src/main/doc/antora.yml       |   0
 .../main/doc/modules/xdocreport}/_attributes.adoc  |   0
 .../impl/src/main/doc/modules/xdocreport}/nav.adoc |   0
 .../doc/modules/xdocreport/pages}/_attributes.adoc |   0
 .../main/doc/modules/xdocreport/pages/about.adoc   |   0
 .../modules/xdocreport/partials}/_attributes.adoc  |   0
 .../modules/xdocreport/partials/module-nav.adoc    |   0
 .../xdocreport/dom/IsisModuleExtXDocReport.java    |   0
 .../extensions/xdocreport/dom/impl/OutputType.java |   0
 .../xdocreport/dom/impl/XDocReportModel.java       |   0
 .../xdocreport/dom/impl/XDocReportService.java     |   0
 .../dom/impl/example/Generate0Fields.java          |   0
 .../xdocreport/dom/impl/example/Generate1Docx.java |   0
 .../xdocreport/dom/impl/example/Generate2Pdf.java  |   0
 .../dom/impl/example/models/Developer.java         |   0
 .../dom/impl/example/models/Project.java           |   0
 .../example/models/ProjectDevelopersModel.java     |   0
 .../impl/example/template/Project-template.docx    | Bin
 .../dom/impl/example/template/project.fields.xml   |   0
 .../dom/impl/service/XDocReportServiceTest.java    |   0
 {extensions/lib => subdomains}/zip/impl/pom.xml    |  12 +-
 .../zip/impl}/src/main/doc/antora.yml              |   0
 .../src/main/doc/modules/zip}/_attributes.adoc     |   0
 .../zip/impl/src/main/doc/modules/zip}/nav.adoc    |   0
 .../main/doc/modules/zip/pages}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/zip/pages/about.adoc |   0
 .../doc/modules/zip/partials}/_attributes.adoc     |   0
 .../main/doc/modules/zip/partials/module-nav.adoc  |   0
 .../isis/extensions/zip/dom/IsisModuleExtZip.java  |   0
 .../isis/extensions/zip/dom/impl/ZipService.java   |   0
 .../excel => testing/fakedata}/fixture/.gitignore  |   0
 .../fixture/logging-dn-enhance.properties          |   0
 .../testing => testing}/fakedata/fixture/pom.xml   |  22 +--
 .../fixture/src/main/java/META-INF/persistence.xml |   0
 .../fixture/IsisModuleExtFakeDataFixtures.java     |   0
 .../fixture/demoapp/demomodule/dom/EnumOf3.java    |   0
 .../demomodule/dom/FakeDataDemoObjectWithAll.java  |   0
 .../demomodule/dom/FakeDataDemoObjectWithAll.png   | Bin
 .../dom/FakeDataDemoObjectWithAllMenu.java         |   0
 .../FakeDataDemoObjectWithAll_create3.java         |   0
 .../FakeDataDemoObjectWithAll_tearDown.java        |   0
 ...eDataDemoObjectWithAll_create_withFakeData.java |   0
 ...eDataDemoObjectWithAll_update_withFakeData.java |   0
 .../testing => testing}/fakedata/impl/pom.xml      |  14 +-
 .../fakedata}/impl/src/main/doc/antora.yml         |   0
 .../main/doc/modules/fakedata}/_attributes.adoc    |   0
 .../impl/src/main/doc/modules/fakedata}/nav.adoc   |   0
 .../doc/modules/fakedata/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/fakedata/pages/about.adoc |   0
 .../modules/fakedata/partials}/_attributes.adoc    |   0
 .../doc/modules/fakedata/partials/module-nav.adoc  |   0
 .../fakedata/dom/IsisModuleExtFakeData.java        |   0
 .../dom/services/AbstractRandomValueGenerator.java |   0
 .../fakedata/dom/services/Addresses.java           |   0
 .../fakedata/dom/services/BigDecimals.java         |   0
 .../fakedata/dom/services/BigIntegers.java         |   0
 .../extensions/fakedata/dom/services/Books.java    |   0
 .../extensions/fakedata/dom/services/Booleans.java |   0
 .../extensions/fakedata/dom/services/Bytes.java    |   0
 .../extensions/fakedata/dom/services/Chars.java    |   0
 .../fakedata/dom/services/Collections.java         |   0
 .../extensions/fakedata/dom/services/Comms.java    |   0
 .../fakedata/dom/services/CreditCards.java         |   0
 .../extensions/fakedata/dom/services/Doubles.java  |   0
 .../extensions/fakedata/dom/services/Enums.java    |   0
 .../fakedata/dom/services/FakeDataService.java     |   0
 .../extensions/fakedata/dom/services/Floats.java   |   0
 .../extensions/fakedata/dom/services/Integers.java |   0
 .../fakedata/dom/services/IsisBlobs.java           |   0
 .../fakedata/dom/services/IsisClobs.java           |   0
 .../fakedata/dom/services/IsisMoneys.java          |   0
 .../fakedata/dom/services/IsisPasswords.java       |   0
 .../fakedata/dom/services/J8DateTimes.java         |   0
 .../fakedata/dom/services/J8LocalDates.java        |   0
 .../fakedata/dom/services/J8Periods.java           |   0
 .../fakedata/dom/services/JavaSqlDates.java        |   0
 .../fakedata/dom/services/JavaSqlTimestamps.java   |   0
 .../fakedata/dom/services/JavaUtilDates.java       |   0
 .../extensions/fakedata/dom/services/Longs.java    |   0
 .../extensions/fakedata/dom/services/Lorem.java    |   0
 .../extensions/fakedata/dom/services/Names.java    |   0
 .../extensions/fakedata/dom/services/Shorts.java   |   0
 .../extensions/fakedata/dom/services/Strings.java  |   0
 .../extensions/fakedata/dom/services/Urls.java     |   0
 .../extensions/fakedata/dom/services/Uuids.java    |   0
 .../services/blobs/Pawson-Naked-Objects-thesis.pdf | Bin
 .../dom/services/blobs/image01-150x150.jpg         | Bin
 .../dom/services/blobs/image01-2048x1536.jpg       | Bin
 .../dom/services/blobs/image01-240x180.jpg         | Bin
 .../dom/services/blobs/image01-4000x3000.jpg       | Bin
 .../dom/services/blobs/image01-640x480.jpg         | Bin
 .../dom/services/blobs/image02-150x150.jpg         | Bin
 .../dom/services/blobs/image02-2048x1536.jpg       | Bin
 .../dom/services/blobs/image02-240x180.jpg         | Bin
 .../dom/services/blobs/image02-4000x3000.jpg       | Bin
 .../dom/services/blobs/image02-640x480.jpg         | Bin
 .../dom/services/blobs/rick-mugridge-paper.pdf     | Bin
 .../fakedata/dom/services/clobs/RTF-Spec-1.7.rtf   |   0
 .../fakedata/dom/services/clobs/a_and_c.xml        |   0
 .../fakedata/dom/services/clobs/all_well.xml       |   0
 .../fakedata/dom/services/clobs/as_you.xml         |   0
 .../fakedata/dom/services/clobs/com_err.xml        |   0
 .../fakedata/dom/services/clobs/config.rtf         |   0
 .../fakedata/dom/services/clobs/coriolan.xml       |   0
 .../fakedata/dom/services/clobs/cymbelin.xml       |   0
 .../fakedata/dom/services/clobs/dream.xml          |   0
 .../fakedata/dom/services/clobs/dsssl.dtd          |   0
 .../extensions/fakedata/dom/services/clobs/fot.dtd |   0
 .../fakedata/dom/services/clobs/hamlet.xml         |   0
 .../fakedata/dom/services/clobs/hen_iv_1.xml       |   0
 .../fakedata/dom/services/clobs/hen_iv_2.xml       |   0
 .../fakedata/dom/services/clobs/hen_v.xml          |   0
 .../fakedata/dom/services/clobs/hen_vi_1.xml       |   0
 .../fakedata/dom/services/clobs/hen_vi_2.xml       |   0
 .../fakedata/dom/services/clobs/hen_vi_3.xml       |   0
 .../fakedata/dom/services/clobs/hen_viii.xml       |   0
 .../fakedata/dom/services/clobs/j_caesar.xml       |   0
 .../fakedata/dom/services/clobs/john.xml           |   0
 .../fakedata/dom/services/clobs/lear.xml           |   0
 .../extensions/fakedata/dom/services/clobs/lll.xml |   0
 .../fakedata/dom/services/clobs/m_for_m.xml        |   0
 .../fakedata/dom/services/clobs/m_wives.xml        |   0
 .../fakedata/dom/services/clobs/macbeth.xml        |   0
 .../fakedata/dom/services/clobs/merchant.xml       |   0
 .../fakedata/dom/services/clobs/much_ado.xml       |   0
 .../fakedata/dom/services/clobs/othello.xml        |   0
 .../fakedata/dom/services/clobs/pericles.xml       |   0
 .../fakedata/dom/services/clobs/play.dtd           |   0
 .../fakedata/dom/services/clobs/r_and_j.xml        |   0
 .../fakedata/dom/services/clobs/rich_ii.xml        |   0
 .../fakedata/dom/services/clobs/rich_iii.xml       |   0
 .../fakedata/dom/services/clobs/sample.rtf         |   0
 .../fakedata/dom/services/clobs/shaksper.htm       |   0
 .../fakedata/dom/services/clobs/style-sheet.dtd    |   0
 .../fakedata/dom/services/clobs/t_night.xml        |   0
 .../fakedata/dom/services/clobs/taming.xml         |   0
 .../fakedata/dom/services/clobs/tempest.xml        |   0
 .../fakedata/dom/services/clobs/testrtf.rtf        |   0
 .../fakedata/dom/services/clobs/timon.xml          |   0
 .../fakedata/dom/services/clobs/titus.xml          |   0
 .../fakedata/dom/services/clobs/troilus.xml        |   0
 .../fakedata/dom/services/clobs/two_gent.xml       |   0
 .../isis/extensions/fakedata/dom/services/clobs/vs |   0
 .../isis/extensions/fakedata/dom/services/clobs/vx |   0
 .../fakedata/dom/services/clobs/win_tale.xml       |   0
 .../extensions/fakedata/dom/services/clobs/xml.dcl |   0
 .../extensions/fakedata/dom/services/clobs/xml.soc |   0
 .../fakedata/dom/services/FakeDataServiceTest.java |   0
 .../fakedata}/integtests/log4j2-test.xml           |   0
 .../fakedata/integtests/pom.xml                    |  22 +--
 .../FakeDataModuleIntegTestAbstract.java           |   0
 .../integtests/tests/Bootstrap_IntegTest.java      |   0
 .../fakedata/integtests/tests/Smoke_IntegTest.java |   0
 .../fakedata}/integtests/toDoItems-actual.xlsx     | Bin
 .../fakedata/integtests/translations.pot           |   0
 {extensions/testing => testing}/fixtures/pom.xml   |  18 +-
 .../fixtures}/src/main/doc/antora.yml              |   0
 .../main/doc/modules/fixtures}/_attributes.adoc    |   0
 .../main/doc/modules/fixtures/images/composite.png | Bin
 .../main/doc/modules/fixtures/images/flat-1.png    | Bin
 .../main/doc/modules/fixtures/images/flat-2.png    | Bin
 .../images/organizing-fixture-scripts.pptx         | Bin
 .../fixtures/images/prompt-specifying-number.png   | Bin
 .../main/doc/modules/fixtures/images/prompt.png    | Bin
 .../modules/fixtures/images/prototyping-menu.png   | Bin
 .../doc/modules/fixtures/images/result-list.png    | Bin
 .../src/main/doc/modules/fixtures}/nav.adoc        |   0
 .../doc/modules/fixtures/pages}/_attributes.adoc   |   0
 .../src/main/doc/modules/fixtures/pages/about.adoc |   0
 .../pages/fixture-scripts}/_attributes.adoc        |   0
 .../pages/fixture-scripts/api-and-usage.adoc       |   0
 .../pages/fixture-scripts/sudo-service.adoc        |   0
 .../fixture-scripts/ticking-clock-fixture.adoc     |   0
 .../modules/fixtures/partials}/_attributes.adoc    |   0
 .../doc/modules/fixtures/partials/module-nav.adoc  |   0
 .../fixtures/FixturesLifecycleService.java         |   0
 .../IsisIntegrationTestAbstractWithFixtures.java   |   0
 .../extensions/fixtures/IsisModuleExtFixtures.java |   0
 .../api/FixtureScriptWithExecutionStrategy.java    |   0
 .../fixtures/api/PersonaWithBuilderScript.java     |   0
 .../extensions/fixtures/api/PersonaWithFinder.java |   0
 .../isis/extensions/fixtures/api/WithPrereqs.java  |   0
 .../isis/extensions/fixtures/api/package-info.java |   0
 .../fixtures/events/FixturesInstalledEvent.java    |   0
 .../fixtures/events/FixturesInstallingEvent.java   |   0
 .../fixturescripts/BuilderScriptAbstract.java      |   0
 .../fixturescripts/BuilderScriptWithResult.java    |   0
 .../fixturescripts/BuilderScriptWithoutResult.java |   0
 .../fixturescripts/ExecutionParameters.java        |   0
 .../fixturescripts/ExecutionParametersService.java |   0
 .../fixtures/fixturescripts/FixtureResult.java     |   0
 .../fixturescripts/FixtureResult.layout.xml        |   0
 .../fixtures/fixturescripts/FixtureResultList.java |   0
 .../fixtures/fixturescripts/FixtureScript.java     |   0
 .../fixtures/fixturescripts/FixtureScripts.java    |   0
 .../fixturespec/FixtureScriptsSpecification.java   |   0
 .../FixtureScriptsSpecificationProvider.java       |   0
 .../fixtures/fixturespec/package-info.java         |   0
 .../extensions/fixtures/legacy/FixtureClock.java   |   0
 .../fixtures/legacy/TickingFixtureClock.java       |   0
 .../fixtures/legacy/clock/ClockFixture.java        |   0
 .../fixtures/legacy/clock/TickingClockFixture.java |   0
 .../extensions/fixtures/legacy/package-info.java   |   0
 .../QueryResultsCacheControlDefault.java           |   0
 .../legacy/setup/PersonaEnumPersistAll.java        |   0
 .../legacy/teardown/TeardownFixtureAbstract.java   |   0
 .../legacy/teardown/TeardownFixtureAbstract2.java  |   0
 .../fixtures/modules/ModuleWithFixtures.java       |   0
 .../modules/ModuleWithFixturesService.java         |   0
 .../fixtures/src/main/resources/prism.css          |   0
 .../fixtures/src/main/resources/prism1.14.js       |   0
 .../fixturescripts/ExecutionContextTest.java       |   0
 .../ExecutionParameters_AsKeyValueMap_Test.java    |   0
 .../fixturescripts/ExecutionParameters_Test.java   |   0
 .../legacy/FixtureClockInstantiationTest.java      |   0
 testing/pom.xml                                    | 196 ++++++++++++++++++++
 .../testing => testing}/specsupport/pom.xml        |  20 +-
 .../specsupport}/src/main/doc/antora.yml           |   0
 .../main/doc/modules/specsupport}/_attributes.adoc |   0
 .../src/main/doc/modules/specsupport}/nav.adoc     |   0
 .../modules/specsupport/pages}/_attributes.adoc    |   0
 .../main/doc/modules/specsupport/pages/about.adoc  |   0
 .../pages/bdd-spec-support}/_attributes.adoc       |   0
 .../pages/bdd-spec-support/how-it-works.adoc       |   0
 .../bdd-spec-support/maven-configuration.adoc      |   0
 .../pages/bdd-spec-support/writing-a-bdd-spec.adoc |   0
 .../modules/specsupport/partials}/_attributes.adoc |   0
 .../modules/specsupport/partials/module-nav.adoc   |   0
 .../specsupport/IsisModuleExtSpecSupport.java      |   0
 .../integration/ObjectFactoryForIntegration.java   |   0
 .../isis/extensions/specsupport/specs/V.java       |   0
 .../unittestsupport/impl/pom.xml                   |  10 +-
 .../unittestsupport}/impl/src/main/doc/antora.yml  |   0
 .../unit-test-support-ext}/_attributes.adoc        |   0
 .../doc/modules/unit-test-support-ext}/nav.adoc    |   0
 .../unit-test-support-ext/pages}/_attributes.adoc  |   0
 .../modules/unit-test-support-ext/pages/about.adoc |   0
 .../partials}/_attributes.adoc                     |   0
 .../unit-test-support-ext/partials/module-nav.adoc |   0
 .../dom/IsisModuleExtUnitTestSupport.java          |   0
 .../unittestsupport/dom/assertions/Asserting.java  |   0
 .../dom/bean/AbstractBeanPropertiesTest.java       |   0
 .../dom/bean/FixtureDatumFactoriesForAnyPojo.java  |   0
 .../dom/bean/FixtureDatumFactoriesForApplib.java   |   0
 .../dom/bean/FixtureDatumFactoriesForJoda.java     |   0
 .../unittestsupport/dom/bean/PojoTester.java       |   0
 .../unittestsupport/dom/matchers/IsisMatchers.java |   0
 .../dom/privatecons/PrivateConstructorTester.java  |   0
 .../unittestsupport/dom/reflect/ReflectUtils.java  |   0
 .../dom/repo/FinderInteraction.java                |   0
 .../unittestsupport/dom/valuetypes/VT.java         |   0
 .../dom/bean/PojoTesterTest_interference.java      |   0
 719 files changed, 812 insertions(+), 358 deletions(-)

diff --git a/core-parent/pom.xml b/core-parent/pom.xml
index 3991197..bdf6361 100644
--- a/core-parent/pom.xml
+++ b/core-parent/pom.xml
@@ -807,7 +807,10 @@ under the License.
 			<modules>
 				<module>../core</module>
 				<module>../mavendeps</module>
+				<module>../testing</module>
 				<module>../extensions</module>
+				<module>../subdomains</module>
+				<module>../mappings</module>
 				<module>../incubator</module>
 				<module>../legacy</module>
 				<module>../starters</module>
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 240f7ef..7abef0ab 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -75,12 +75,12 @@
 			<artifactId>isis-incubator-model</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>isis-extensions-fixtures</artifactId>
+			<groupId>org.apache.isis.testing</groupId>
+			<artifactId>isis-testing-fixtures</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>isis-extensions-restclient</artifactId>
+			<groupId>org.apache.isis.mappings</groupId>
+			<artifactId>isis-mappings-restclient</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.isis.extensions</groupId>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index b080c30..7fa0c77 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -45,7 +45,7 @@ import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
 @Import({
     IsisModuleSpringBoot.class,
     IsisModuleSecurityBypass.class,
-    IsisModuleIncModelMetaModel.class // @Supporting support
+    IsisModuleIncModelMetaModel.class // @Model support
 })
 @PropertySources({
     @PropertySource(IsisPresets.NoTranslations),
diff --git a/extensions/lib/jaxrsclient/impl/pom.xml b/extensions/lib/jaxrsclient/impl/pom.xml
deleted file mode 100644
index 9ca034c..0000000
--- a/extensions/lib/jaxrsclient/impl/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
-		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>isis-extensions-jaxrsclient-dom</artifactId>
-	<name>Apache Isis Ext - JaxRS Client</name>
-	<description>Integrates JaxRS Client Library</description>
-
-	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.jaxrsclient.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/jaxrsclient/dom</git-plugin.propertiesDir>
-	</properties>
-
-	<dependencies>
-
-	</dependencies>
-
-</project>
diff --git a/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java b/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
deleted file mode 100644
index ab16d86..0000000
--- a/extensions/lib/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  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.extensions.jaxrsclient.dom;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class IsisModuleExtJaxRsClient {
-
-}
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b784b23..7f79ec3 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -26,7 +26,8 @@
 
 	<name>Apache Isis Extensions</name>
 	<description>
-        Collection of Apache Isis extensions.
+        Extensions to the Apache Isis framework itself.
+		These are _not_ intended to be called by the domain logic of an Apache Isis application (see instead org.apache.isis.platform).
     </description>
 
 	<packaging>pom</packaging>
@@ -73,31 +74,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-fixtures</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.incubator</groupId>
-				<artifactId>isis-incubator-model</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-legacy</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
 				<artifactId>isis-extensions-markdown</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-restclient</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
 				<artifactId>isis-extensions-secman</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
@@ -128,16 +109,6 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-specsupport</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-spring</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
 				<artifactId>isis-extensions-h2console-dom</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
@@ -157,94 +128,26 @@
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 
+			<!-- testing -->
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-base-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-excel-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-excel-fixtures</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-excel-integtests</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-fakedata-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-fakedata-fixtures</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-fakedata-integtests</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-unittestsupport-dom</artifactId>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-xdocreport-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>isis-extensions-zip-dom</artifactId>
-				<version>2.0.0-M3-SNAPSHOT</version>
-			</dependency>
 
 		</dependencies>
 	</dependencyManagement>
 
 	<modules>
-		<module>core/spring</module>
-		<module>lib/base/impl</module>
-<!--
-		<module>lib/excel/fixture</module>
-		<module>lib/excel/integtests</module>
--->
-		<module>lib/excel/impl</module>
-
-		<module>lib/xdocreport/impl</module>
-		<module>lib/zip/impl</module>
-
 		<module>persistence/h2console/impl</module>
 		<module>persistence/hsqldbmgr/impl</module>
 
 		<module>security/secman</module>
 		<module>security/shiro-realm-ldap</module>
 
-		<module>testing/fakedata/impl</module>
-		<module>testing/fakedata/fixture</module>
-<!--
-		<module>testing/fakedata/integtests</module>
--->
-		<module>testing/fixtures</module>
-		<module>testing/specsupport</module>
-		<module>testing/unittestsupport/impl</module>
-
 		<module>vro/cors</module>
-		<module>vro/restclient</module>
+
 		<module>vw/asciidoc</module>
 		<module>vw/exceldownload</module>
 		<module>vw/markdown</module>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index 0e3ebc4..e1a6431 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -67,8 +67,8 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>isis-extensions-fixtures</artifactId>
+			<groupId>org.apache.isis.testing</groupId>
+			<artifactId>isis-testing-fixtures</artifactId>
 			<version>2.0.0-M3-SNAPSHOT</version>
 		</dependency>
 
diff --git a/incubator/core/jsr303/README.adoc b/incubator/extensions/core/jsr303/README.adoc
similarity index 100%
rename from incubator/core/jsr303/README.adoc
rename to incubator/extensions/core/jsr303/README.adoc
diff --git a/incubator/core/jsr303/pom.xml b/incubator/extensions/core/jsr303/pom.xml
similarity index 100%
rename from incubator/core/jsr303/pom.xml
rename to incubator/extensions/core/jsr303/pom.xml
diff --git a/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
similarity index 100%
rename from incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
rename to incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
diff --git a/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
similarity index 100%
rename from incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
rename to incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
diff --git a/incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
similarity index 100%
rename from incubator/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
rename to incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
similarity index 100%
rename from incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
rename to incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
diff --git a/incubator/core/microprofile/pom.xml b/incubator/extensions/core/microprofile/pom.xml
similarity index 97%
rename from incubator/core/microprofile/pom.xml
rename to incubator/extensions/core/microprofile/pom.xml
index 7f4b2cc..cf448cf 100644
--- a/incubator/core/microprofile/pom.xml
+++ b/incubator/extensions/core/microprofile/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.incubator</groupId>
 		<artifactId>isis-incubator</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-incubator-microprofile</artifactId>
diff --git a/incubator/core/model/src/main/doc/antora.yml b/incubator/extensions/core/microprofile/src/main/doc/antora.yml
similarity index 100%
rename from incubator/core/model/src/main/doc/antora.yml
rename to incubator/extensions/core/microprofile/src/main/doc/antora.yml
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/_attributes.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/nav.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/nav.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/nav.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/nav.adoc
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/_attributes.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/_attributes.adoc
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/pages/about.adoc
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/_attributes.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc b/incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/partials/module-nav.adoc
rename to incubator/extensions/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
diff --git a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
similarity index 100%
rename from incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
rename to incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
diff --git a/incubator/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
similarity index 100%
rename from incubator/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
diff --git a/incubator/core/model/pom.xml b/incubator/extensions/core/model/pom.xml
similarity index 97%
rename from incubator/core/model/pom.xml
rename to incubator/extensions/core/model/pom.xml
index e1eb074..75bc48b 100644
--- a/incubator/core/model/pom.xml
+++ b/incubator/extensions/core/model/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.incubator</groupId>
 		<artifactId>isis-incubator</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-incubator-model</artifactId>
diff --git a/incubator/core/microprofile/src/main/doc/antora.yml b/incubator/extensions/core/model/src/main/doc/antora.yml
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/antora.yml
rename to incubator/extensions/core/model/src/main/doc/antora.yml
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/_attributes.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/_attributes.adoc
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/nav.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/nav.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/nav.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/nav.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/pages/_attributes.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/pages/_attributes.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/pages/about.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/pages/about.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/pages/about.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/pages/about.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/partials/_attributes.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/partials/_attributes.adoc
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc b/incubator/extensions/core/model/src/main/doc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/partials/module-nav.adoc
rename to incubator/extensions/core/model/src/main/doc/modules/model/partials/module-nav.adoc
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java b/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
similarity index 100%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
rename to incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/IsisModuleIncModelApplib.java
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java b/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
similarity index 100%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
rename to incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/applib/annotation/Model.java
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java b/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
similarity index 100%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
rename to incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/IsisModuleIncModelMetaModel.java
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java b/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
similarity index 100%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
rename to incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/facets/SupportingMethodValidatorRefinerFactory.java
diff --git a/incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java b/incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
similarity index 100%
rename from incubator/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
rename to incubator/extensions/core/model/src/main/java/org/apache/isis/incubator/model/metamodel/services/IncubatorMetaModelPlugin.java
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 8addef5..98ad091 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -26,7 +26,7 @@
 
 	<name>Apache Isis Incubator</name>
 	<description>
-        Collection of Apache Isis extensions, currently incubating.
+        Collection of Apache Isis extensions, subdomains or BC mappings, currently incubating.
     </description>
 
 	<packaging>pom</packaging>
@@ -70,12 +70,20 @@
 				<artifactId>isis-incubator-microprofile</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
+
+			<!-- testing -->
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 
 	<modules>
-		<module>core/model</module>
-		<module>core/microprofile</module>
+		<module>extensions/core/model</module>
+		<module>extensions/core/microprofile</module>
 	</modules>
 
 </project>
diff --git a/legacy/core/runtime/.gitignore b/legacy/extensions/core/applib/.gitignore
similarity index 100%
rename from legacy/core/runtime/.gitignore
rename to legacy/extensions/core/applib/.gitignore
diff --git a/legacy/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
similarity index 100%
rename from legacy/core/applib/pom.xml
rename to legacy/extensions/core/applib/pom.xml
diff --git a/legacy/vro/restclient/src/main/doc/antora.yml b/legacy/extensions/core/applib/src/main/doc/antora.yml
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/antora.yml
rename to legacy/extensions/core/applib/src/main/doc/antora.yml
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/_attributes.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/_attributes.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/_attributes.adoc
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/nav.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/nav.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/nav.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/nav.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/pages/about.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/pages/about.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/pages/about.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/pages/about.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc b/legacy/extensions/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
rename to legacy/extensions/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/DomainObjectContainer.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filter.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filters.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filters.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filters.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/filter/Filters.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundCommandService2.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundCommandService2.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundCommandService2.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundCommandService2.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService2.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService2.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService2.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/background/BackgroundService2.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/ActionDomainEvent.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/CollectionDomainEvent.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/services/eventbus/PropertyDomainEvent.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Magnitude.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Magnitude.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Magnitude.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Magnitude.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
diff --git a/legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
similarity index 100%
rename from legacy/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
rename to legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
diff --git a/legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/ColorTest.java b/legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/ColorTest.java
similarity index 100%
rename from legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/ColorTest.java
rename to legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/ColorTest.java
diff --git a/legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/MoneyTest.java b/legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/MoneyTest.java
similarity index 100%
rename from legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/MoneyTest.java
rename to legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/MoneyTest.java
diff --git a/legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/PercentageTest.java b/legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/PercentageTest.java
similarity index 100%
rename from legacy/core/applib/src/test/java/org/apache/isis/legacy/applib/value/PercentageTest.java
rename to legacy/extensions/core/applib/src/test/java/org/apache/isis/legacy/applib/value/PercentageTest.java
diff --git a/legacy/core/metamodel/.gitignore b/legacy/extensions/core/commons/.gitignore
similarity index 100%
rename from legacy/core/metamodel/.gitignore
rename to legacy/extensions/core/commons/.gitignore
diff --git a/legacy/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
similarity index 100%
rename from legacy/core/commons/pom.xml
rename to legacy/extensions/core/commons/pom.xml
diff --git a/legacy/core/runtime/src/main/doc/antora.yml b/legacy/extensions/core/commons/src/main/doc/antora.yml
similarity index 100%
rename from legacy/core/runtime/src/main/doc/antora.yml
rename to legacy/extensions/core/commons/src/main/doc/antora.yml
diff --git a/legacy/core/commons/src/main/doc/modules/commons/_attributes.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/_attributes.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/_attributes.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/nav.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/nav.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/nav.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/nav.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/pages/about.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/pages/about.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/pages/about.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/pages/about.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/pages/_attributes.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/partials/_attributes.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc b/legacy/extensions/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
rename to legacy/extensions/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
similarity index 100%
rename from legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/FutureWithIndexIntoFutureOfList.java
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
similarity index 100%
rename from legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolExecutionMode.java
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSizeAdvisor.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
similarity index 100%
rename from legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSizeAdvisor.java
diff --git a/legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
similarity index 100%
rename from legacy/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
rename to legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
diff --git a/legacy/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupportTest.java b/legacy/extensions/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupportTest.java
similarity index 100%
rename from legacy/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupportTest.java
rename to legacy/extensions/core/commons/src/test/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupportTest.java
diff --git a/legacy/core/commons/.gitignore b/legacy/extensions/core/metamodel/.gitignore
similarity index 100%
rename from legacy/core/commons/.gitignore
rename to legacy/extensions/core/metamodel/.gitignore
diff --git a/legacy/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
similarity index 100%
rename from legacy/core/metamodel/pom.xml
rename to legacy/extensions/core/metamodel/pom.xml
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacet.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacet.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacet.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacet.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueFacetUsingSemanticsProviderFactory.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueSemanticsProvider.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueSemanticsProvider.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/color/ColorValueSemanticsProvider.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacet.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacet.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacet.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacet.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacetUsingSemanticsProviderFactory.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacetUsingSemanticsProviderFactory.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacetUsingSemanticsProviderFactory.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueFacetUsingSemanticsProviderFactory.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueFacetUsingSemanticsProviderFactory.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueFacetUsingSemanticsProviderFactory.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueFacetUsingSemanticsProviderFactory.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueFacetUsingSemanticsProviderFactory.java
diff --git a/legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
similarity index 100%
rename from legacy/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
rename to legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
similarity index 100%
rename from legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
rename to legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/ColorValueSemanticsProviderTest.java
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
similarity index 100%
rename from legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
rename to legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
similarity index 100%
rename from legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
rename to legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
diff --git a/legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
similarity index 100%
rename from legacy/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
rename to legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
diff --git a/legacy/core/applib/.gitignore b/legacy/extensions/core/runtime/.gitignore
similarity index 100%
rename from legacy/core/applib/.gitignore
rename to legacy/extensions/core/runtime/.gitignore
diff --git a/legacy/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
similarity index 100%
rename from legacy/core/runtime/pom.xml
rename to legacy/extensions/core/runtime/pom.xml
diff --git a/legacy/core/commons/src/main/doc/antora.yml b/legacy/extensions/core/runtime/src/main/doc/antora.yml
similarity index 100%
rename from legacy/core/commons/src/main/doc/antora.yml
rename to legacy/extensions/core/runtime/src/main/doc/antora.yml
diff --git a/legacy/core/applib/src/main/doc/modules/applib/_attributes.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/_attributes.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/_attributes.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/_attributes.adoc
diff --git a/legacy/core/commons/src/main/doc/modules/commons/nav.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/nav.adoc
similarity index 100%
rename from legacy/core/commons/src/main/doc/modules/commons/nav.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/nav.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/partials/_attributes.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/pages/about.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/pages/_attributes.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/_attributes.adoc
diff --git a/legacy/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc b/legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
similarity index 100%
rename from legacy/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
rename to legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/jdo/datanucleus5/datanucleus/valuetypes/IsisMoneyMapping.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/jdo/datanucleus5/datanucleus/valuetypes/IsisMoneyMapping.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/jdo/datanucleus5/datanucleus/valuetypes/IsisMoneyMapping.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/jdo/datanucleus5/datanucleus/valuetypes/IsisMoneyMapping.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializer.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializer.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializer.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializer.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializerJaxp.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializerJaxp.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializerJaxp.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/snapshot/DomSerializerJaxp.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/sysout/SystemPrinter.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/sysout/SystemPrinter.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/sysout/SystemPrinter.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/sysout/SystemPrinter.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/LoggingLocation.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/LoggingLocation.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/LoggingLocation.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/LoggingLocation.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/ObjectFactory.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/ObjectFactory.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/ObjectFactory.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/ObjectFactory.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/SuspendableListener.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/SuspendableListener.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/SuspendableListener.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/system/persistence/SuspendableListener.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/AbstractServletOrFilterMapping.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/AbstractServletOrFilterMapping.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/AbstractServletOrFilterMapping.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/AbstractServletOrFilterMapping.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/FilterSpecification.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/FilterSpecification.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/FilterSpecification.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/FilterSpecification.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/ServletSpecification.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/ServletSpecification.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/ServletSpecification.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/ServletSpecification.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/WebAppSpecification.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/WebAppSpecification.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/WebAppSpecification.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/web/WebAppSpecification.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanelFactory.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanelFactory.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
diff --git a/legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java b/legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
similarity index 100%
rename from legacy/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
rename to legacy/extensions/core/runtime/src/main/java/org/apache/isis/legacy/runtime/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanelFactory.java
diff --git a/legacy/vro/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
similarity index 100%
rename from legacy/vro/restclient/pom.xml
rename to legacy/mappings/restclient/pom.xml
diff --git a/legacy/core/applib/src/main/doc/antora.yml b/legacy/mappings/restclient/src/main/doc/antora.yml
similarity index 100%
rename from legacy/core/applib/src/main/doc/antora.yml
rename to legacy/mappings/restclient/src/main/doc/antora.yml
diff --git a/incubator/core/model/src/main/doc/modules/model/_attributes.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/_attributes.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/_attributes.adoc
diff --git a/legacy/core/applib/src/main/doc/modules/applib/nav.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/nav.adoc
similarity index 100%
rename from legacy/core/applib/src/main/doc/modules/applib/nav.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/nav.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/partials/_attributes.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/partials/_attributes.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc
diff --git a/incubator/core/model/src/main/doc/modules/model/pages/_attributes.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
similarity index 100%
rename from incubator/core/model/src/main/doc/modules/model/pages/_attributes.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
diff --git a/legacy/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc b/legacy/mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from legacy/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to legacy/mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/ClientRequestFactory.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/ClientRequestFactory.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/ClientRequestFactory.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/ClientRequestFactory.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RepresentationWalker.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RepresentationWalker.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RepresentationWalker.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RepresentationWalker.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestEasyLegacy.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClient.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClient.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClient.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClient.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClientException.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClientException.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClientException.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/RestfulClientException.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientExecutor.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientExecutor.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientExecutor.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientExecutor.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequest.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequest.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequest.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequest.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java b/legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
similarity index 100%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
rename to legacy/mappings/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
diff --git a/legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java b/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
similarity index 100%
rename from legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
rename to legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
diff --git a/legacy/pom.xml b/legacy/pom.xml
index 69a3c7e..f156dea 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -80,15 +80,23 @@
 				<artifactId>isis-legacy-restclient</artifactId>
 				<version>2.0.0-M3-SNAPSHOT</version>
 			</dependency>
+
+			<!-- testing -->
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 
 	<modules>
-		<module>core/applib</module>
-		<module>core/commons</module>
-		<module>core/metamodel</module>
-		<module>core/runtime</module>
-		<module>vro/restclient</module>
+		<module>extensions/core/applib</module>
+		<module>extensions/core/commons</module>
+		<module>extensions/core/metamodel</module>
+		<module>extensions/core/runtime</module>
+		<module>mappings/restclient</module>
 	</modules>
 
 </project>
diff --git a/extensions/lib/pdfbox/impl/pom.xml b/legacy/subdomains/servletapi/impl/pom.xml
similarity index 75%
copy from extensions/lib/pdfbox/impl/pom.xml
copy to legacy/subdomains/servletapi/impl/pom.xml
index 6d0384e..1a983ff 100644
--- a/extensions/lib/pdfbox/impl/pom.xml
+++ b/legacy/subdomains/servletapi/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.legacy</groupId>
+		<artifactId>isis-legacy</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-pdfbox-dom</artifactId>
-	<name>Apache Isis Ext - PDF Box</name>
-	<description>Integrates PDF Box Library</description>
+	<artifactId>isis-legacy-servletapi-dom</artifactId>
+	<name>Apache Isis Legacy - Servlet APIClient</name>
+	<description>Integrates Servlet API</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.pdfbox.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/pdfbox/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.legacy.servletapi.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/legacy/servletapi/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/vw/servletapi/impl/src/main/doc/antora.yml b/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/antora.yml
rename to legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/_attributes.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/_attributes.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/_attributes.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/_attributes.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/partials/_attributes.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/_attributes.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/partials/_attributes.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/_attributes.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc
diff --git a/incubator/core/microprofile/src/main/doc/modules/microprofile/pages/_attributes.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/_attributes.adoc
similarity index 100%
rename from incubator/core/microprofile/src/main/doc/modules/microprofile/pages/_attributes.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/_attributes.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc b/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc
rename to legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java b/legacy/subdomains/servletapi/impl/src/main/java/org/apache/isis/subdomains/servletapi/dom/IsisModuleSubServletApi.java
similarity index 91%
copy from extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
copy to legacy/subdomains/servletapi/impl/src/main/java/org/apache/isis/subdomains/servletapi/dom/IsisModuleSubServletApi.java
index 5454736..2d299de 100644
--- a/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
+++ b/legacy/subdomains/servletapi/impl/src/main/java/org/apache/isis/subdomains/servletapi/dom/IsisModuleSubServletApi.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.freemarker.dom;
+package org.apache.isis.subdomains.servletapi.dom;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @ComponentScan
-public class IsisModuleExtFreemarker {
+public class IsisModuleSubServletApi {
 
 }
diff --git a/legacy/testsupport/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
similarity index 100%
rename from legacy/testsupport/mavenplugin/pom.xml
rename to legacy/testing/mavenplugin/pom.xml
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/antora.yml b/legacy/testing/mavenplugin/src/main/doc/antora.yml
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/antora.yml
rename to legacy/testing/mavenplugin/src/main/doc/antora.yml
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/_attributes.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/_attributes.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/nav.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/nav.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/partials/_attributes.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/partials/_attributes.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/pages/_attributes.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/doc/modules/servletapi/pages/_attributes.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc b/legacy/testing/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
rename to legacy/testing/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
diff --git a/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
similarity index 100%
rename from legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
rename to legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
diff --git a/extensions/vw/servletapi/impl/pom.xml b/mappings/jaxrsclient/impl/pom.xml
similarity index 73%
rename from extensions/vw/servletapi/impl/pom.xml
rename to mappings/jaxrsclient/impl/pom.xml
index 9ca034c..de93e09 100644
--- a/extensions/vw/servletapi/impl/pom.xml
+++ b/mappings/jaxrsclient/impl/pom.xml
@@ -15,19 +15,20 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.mappings</groupId>
+		<artifactId>isis-mappings</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-jaxrsclient-dom</artifactId>
-	<name>Apache Isis Ext - JaxRS Client</name>
+	<artifactId>isis-mappings-jaxrsclient-dom</artifactId>
+	<name>Apache Isis Map - JaxRS Client</name>
+
 	<description>Integrates JaxRS Client Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.jaxrsclient.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/jaxrsclient/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/zip/impl/src/main/doc/antora.yml b/mappings/jaxrsclient/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/antora.yml
rename to mappings/jaxrsclient/impl/src/main/doc/antora.yml
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/_attributes.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/_attributes.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/_attributes.adoc
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/nav.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/nav.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/_attributes.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/partials/_attributes.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/_attributes.adoc
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/_attributes.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/pages/_attributes.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/_attributes.adoc
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
similarity index 100%
rename from extensions/vw/servletapi/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
rename to mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
diff --git a/extensions/lib/minio/impl/pom.xml b/mappings/minio/impl/pom.xml
similarity index 77%
rename from extensions/lib/minio/impl/pom.xml
rename to mappings/minio/impl/pom.xml
index 79a4dbe..a3f19ce 100644
--- a/extensions/lib/minio/impl/pom.xml
+++ b/mappings/minio/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.mappings</groupId>
+		<artifactId>isis-mappings</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-minio-dom</artifactId>
-	<name>Apache Isis Ext - Minio</name>
+	<artifactId>isis-mappings-minio-dom</artifactId>
+	<name>Apache Isis Map - Minio</name>
 	<description>Integrates Minio Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.minio.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/minio/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.mappings.minio.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/mappings/minio/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/antora.yml b/mappings/minio/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/antora.yml
rename to mappings/minio/impl/src/main/doc/antora.yml
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc b/mappings/minio/impl/src/main/doc/modules/minio/_attributes.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/_attributes.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc b/mappings/minio/impl/src/main/doc/modules/minio/nav.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/nav.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/_attributes.adoc b/mappings/minio/impl/src/main/doc/modules/minio/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/_attributes.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/pages/_attributes.adoc
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/pages/about.adoc b/mappings/minio/impl/src/main/doc/modules/minio/pages/about.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/pages/about.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/pages/about.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc b/mappings/minio/impl/src/main/doc/modules/minio/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/partials/_attributes.adoc
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc b/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
rename to mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
diff --git a/mappings/pom.xml b/mappings/pom.xml
new file mode 100644
index 0000000..a78793b
--- /dev/null
+++ b/mappings/pom.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.core</groupId>
+		<artifactId>isis</artifactId>
+		<version>2.0.0-M3-SNAPSHOT</version>
+		<relativePath>../core/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.isis.mappings</groupId>
+	<artifactId>isis-mappings</artifactId>
+
+	<name>Apache Isis Mappings</name>
+	<description>
+        Libraries and tools to map one bounded context (usually an Apache Isis application) to some other BC (usually
+		_not_ an Apache Isis application).
+    </description>
+
+	<packaging>pom</packaging>
+
+	<properties>
+		<jar-plugin.automaticModuleName>org.apache.isis.mappings</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/mappings</git-plugin.propertiesDir>
+	</properties>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+
+			<dependency>
+				<groupId>org.apache.isis.mappings</groupId>
+				<artifactId>isis-mappings-restclient</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<!-- testing -->
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>restclient/impl</module>
+	</modules>
+
+	<profiles>
+		<profile>
+			<id>isis-app-starter-datanucleusenhance</id>
+			<activation>
+				<file>
+					<exists>${basedir}/logging-dn-enhance.properties</exists>
+				</file>
+			</activation>
+			<properties>
+
+				<!-- keep in sync with versions used in Apache Isis -->
+				<datanucleus-api-jdo.version>5.2.2</datanucleus-api-jdo.version>
+				<datanucleus-core.version>5.2.2</datanucleus-core.version>
+				<datanucleus-jodatime.version>5.2.0-release</datanucleus-jodatime.version>
+				<datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
+
+				<datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
+				<datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
+				<datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
+
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.datanucleus</groupId>
+						<artifactId>datanucleus-maven-plugin</artifactId>
+						<version>${datanucleus-maven-plugin.version}</version>
+						<configuration>
+							<fork>${datanucleus-maven-plugin.fork}</fork>
+							<log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
+							<verbose>${datanucleus-maven-plugin.verbose}</verbose>
+						</configuration>
+						<executions>
+							<execution>
+								<id>process-classes</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>enhance</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>process-test-classes</id>
+								<phase>process-test-classes</phase>
+								<goals>
+									<goal>test-enhance</goal>
+								</goals>
+								<configuration>
+									<metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+								</configuration>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-core</artifactId>
+								<version>${datanucleus-core.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-api-jdo</artifactId>
+								<version>${datanucleus-api-jdo.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-jodatime</artifactId>
+								<version>${datanucleus-jodatime.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+</project>
+
+
diff --git a/extensions/vro/restclient/pom.xml b/mappings/restclient/impl/pom.xml
similarity index 81%
rename from extensions/vro/restclient/pom.xml
rename to mappings/restclient/impl/pom.xml
index 5bb1042..ab88f0f 100644
--- a/extensions/vro/restclient/pom.xml
+++ b/mappings/restclient/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.mappings</groupId>
+		<artifactId>isis-mappings</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-restclient</artifactId>
+	<artifactId>isis-mappings-restclient</artifactId>
 	<name>Apache Isis Ext - REST Client</name>
 	<description>A client for the Restful Objects Viewer</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.restclient</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/restclient</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.mappings.restclient</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/mappings/restclient</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/vro/restclient/src/main/doc/antora.yml b/mappings/restclient/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/antora.yml
rename to mappings/restclient/impl/src/main/doc/antora.yml
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/_attributes.adoc
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/nav.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/nav.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/pages/_attributes.adoc
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/pages/about.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/partials/_attributes.adoc
diff --git a/extensions/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from extensions/vro/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
diff --git a/extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java b/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
similarity index 100%
rename from extensions/vro/restclient/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
rename to mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
diff --git a/extensions/lib/slack/impl/pom.xml b/mappings/slack/impl/pom.xml
similarity index 77%
rename from extensions/lib/slack/impl/pom.xml
rename to mappings/slack/impl/pom.xml
index a9827e4..84768a9 100644
--- a/extensions/lib/slack/impl/pom.xml
+++ b/mappings/slack/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.mappings</groupId>
+		<artifactId>isis-mappings</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-slack-dom</artifactId>
-	<name>Apache Isis Ext - Slack</name>
+	<artifactId>isis-mappings-slack-dom</artifactId>
+	<name>Apache Isis Map - Slack</name>
 	<description>Integrates Slack Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.slack.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/slack/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.mappings.slack.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/mappings/slack/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/slack/impl/src/main/doc/antora.yml b/mappings/slack/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/antora.yml
rename to mappings/slack/impl/src/main/doc/antora.yml
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc b/mappings/slack/impl/src/main/doc/modules/slack/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/_attributes.adoc
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/nav.adoc b/mappings/slack/impl/src/main/doc/modules/slack/nav.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/nav.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/nav.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc b/mappings/slack/impl/src/main/doc/modules/slack/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/pages/_attributes.adoc
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/pages/about.adoc b/mappings/slack/impl/src/main/doc/modules/slack/pages/about.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/pages/about.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/pages/about.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc b/mappings/slack/impl/src/main/doc/modules/slack/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/partials/_attributes.adoc
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc b/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
rename to mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
diff --git a/extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java b/mappings/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
similarity index 100%
rename from extensions/lib/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
rename to mappings/slack/impl/src/main/java/org/apache/isis/extensions/slack/dom/IsisModuleExtSlack.java
diff --git a/starters/pom.xml b/starters/pom.xml
index bd92b2e..a21bd62 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -94,6 +94,38 @@ under the License.
 			</dependency>
 
 			<dependency>
+				<groupId>org.apache.isis.incubator</groupId>
+				<artifactId>isis-incubator</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.legacy</groupId>
+				<artifactId>isis-legacy</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.mappings</groupId>
+				<artifactId>isis-mappings</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+
+			<dependency>
 				<groupId>com.approvaltests</groupId>
 				<artifactId>approvaltests</artifactId>
 				<version>${approvaltests.version}</version>
diff --git a/extensions/lib/base/impl/pom.xml b/subdomains/base/impl/pom.xml
similarity index 79%
rename from extensions/lib/base/impl/pom.xml
rename to subdomains/base/impl/pom.xml
index b39b44f..184c702 100644
--- a/extensions/lib/base/impl/pom.xml
+++ b/subdomains/base/impl/pom.xml
@@ -3,24 +3,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.subdomains</groupId>
+        <artifactId>isis-subdomains</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 	
-    <artifactId>isis-extensions-base-dom</artifactId>
+    <artifactId>isis-subdomains-base-dom</artifactId>
 
     <packaging>jar</packaging>
 
-    <name>Apache Isis Ext - Base</name>
+    <name>Apache Isis Sub - Base</name>
     <description>
-        A module providing Base utilities for domain modules
+        A module providing Base utilities for other subdomain modules
     </description>
 
     <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.extensions.base</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/base</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.subdomains.base</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/subdomains/base</git-plugin.propertiesDir>
     </properties>
 
     <dependencies>
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/antora.yml b/subdomains/base/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/antora.yml
rename to subdomains/base/impl/src/main/doc/antora.yml
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc b/subdomains/base/impl/src/main/doc/modules/base/_attributes.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/_attributes.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc b/subdomains/base/impl/src/main/doc/modules/base/nav.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/nav.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/_attributes.adoc b/subdomains/base/impl/src/main/doc/modules/base/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/_attributes.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/pages/_attributes.adoc
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/pages/about.adoc b/subdomains/base/impl/src/main/doc/modules/base/pages/about.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/pages/about.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/pages/about.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc b/subdomains/base/impl/src/main/doc/modules/base/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/partials/_attributes.adoc
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/partials/module-nav.adoc b/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
rename to subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java b/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
similarity index 100%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
rename to subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
similarity index 100%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
diff --git a/extensions/lib/docx/impl/pom.xml b/subdomains/docx/impl/pom.xml
similarity index 75%
rename from extensions/lib/docx/impl/pom.xml
rename to subdomains/docx/impl/pom.xml
index 6d6ed4a..d362e1b 100644
--- a/extensions/lib/docx/impl/pom.xml
+++ b/subdomains/docx/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-docx-dom</artifactId>
-	<name>Apache Isis Ext - Docx</name>
-	<description>Integrates POI library for mail merge functions of .docx Word documents</description>
+	<artifactId>isis-subdomains-docx-dom</artifactId>
+	<name>Apache Isis Sub - Docx</name>
+	<description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.docx.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/docx/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/docx/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/ognl/impl/src/main/doc/antora.yml b/subdomains/docx/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/antora.yml
rename to subdomains/docx/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/_attributes.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/_attributes.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/_attributes.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/_attributes.adoc
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/nav.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/nav.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/partials/_attributes.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/partials/_attributes.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/pages/about.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/pages/about.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/pages/_attributes.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/pages/_attributes.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/partials/_attributes.adoc
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc b/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
rename to subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
diff --git a/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java b/subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
similarity index 100%
rename from extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
rename to subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
diff --git a/extensions/testing/fakedata/fixture/.gitignore b/subdomains/excel/fixture/.gitignore
similarity index 100%
rename from extensions/testing/fakedata/fixture/.gitignore
rename to subdomains/excel/fixture/.gitignore
diff --git a/extensions/testing/fakedata/fixture/logging-dn-enhance.properties b/subdomains/excel/fixture/logging-dn-enhance.properties
similarity index 100%
rename from extensions/testing/fakedata/fixture/logging-dn-enhance.properties
rename to subdomains/excel/fixture/logging-dn-enhance.properties
diff --git a/extensions/lib/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
similarity index 79%
rename from extensions/lib/excel/fixture/pom.xml
rename to subdomains/excel/fixture/pom.xml
index 9e36950..b4b52d0 100644
--- a/extensions/lib/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -3,18 +3,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.subdomains</groupId>
+        <artifactId>isis-subdomains</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-excel-fixtures</artifactId>
-    <name>Apache Isis Ext - Excel (Fixtures)</name>
+    <artifactId>isis-subdomains-excel-fixtures</artifactId>
+    <name>Apache Isis Sub - Excel (Fixtures)</name>
     
     <properties>
-    	<jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.fixtures</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/excel/fixtures</git-plugin.propertiesDir>
+    	<jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.fixtures</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/fixtures</git-plugin.propertiesDir>
     </properties>
 
     <build>
@@ -55,8 +55,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-excel-dom</artifactId>
+            <groupId>org.apache.isis.subdomains</groupId>
+            <artifactId>isis-subdomains-excel-dom</artifactId>
         </dependency>
 
         <dependency>
@@ -65,8 +65,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fixtures</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fixtures</artifactId>
         </dependency>
 
 <!--
@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fakedata-dom</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fakedata-dom</artifactId>
         </dependency>
 -->
 
diff --git a/extensions/lib/excel/fixture/src/main/java/META-INF/persistence.xml b/subdomains/excel/fixture/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/META-INF/persistence.xml
rename to subdomains/excel/fixture/src/main/java/META-INF/persistence.xml
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
diff --git a/extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
similarity index 100%
rename from extensions/lib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
diff --git a/extensions/lib/excel/impl/pom.xml b/subdomains/excel/impl/pom.xml
similarity index 85%
rename from extensions/lib/excel/impl/pom.xml
rename to subdomains/excel/impl/pom.xml
index 4af9c53..f1829d9 100644
--- a/extensions/lib/excel/impl/pom.xml
+++ b/subdomains/excel/impl/pom.xml
@@ -13,14 +13,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.subdomains</groupId>
+        <artifactId>isis-subdomains</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-excel-dom</artifactId>
-    <name>Apache Isis Ext - Excel (Domain Library)</name>
+    <artifactId>isis-subdomains-excel-dom</artifactId>
+    <name>Apache Isis Sub - Excel</name>
 
     <description>
         A domain service for Apache Isis', allowing collections
@@ -29,8 +29,8 @@
     </description>
 
     <properties>
-    	<jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.dom</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/excel/dom</git-plugin.propertiesDir>
+    	<jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.dom</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/dom</git-plugin.propertiesDir>
     </properties>
 
     <dependencies>
@@ -47,8 +47,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fixtures</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fixtures</artifactId>
         </dependency>
 
         <dependency>
diff --git a/extensions/lib/minio/impl/src/main/doc/antora.yml b/subdomains/excel/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/antora.yml
rename to subdomains/excel/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/_attributes.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/_attributes.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/_attributes.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/_attributes.adoc
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/nav.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/nav.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/nav.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/nav.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials/_attributes.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials/_attributes.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/pages/about.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/pages/about.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/pages/about.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/pages/about.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/pages/_attributes.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/pages/_attributes.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/partials/_attributes.adoc
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc b/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
rename to subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java
diff --git a/extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java b/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
similarity index 100%
rename from extensions/lib/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
rename to subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java b/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
similarity index 100%
rename from extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
rename to subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java b/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
similarity index 100%
rename from extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
rename to subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java b/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
similarity index 100%
rename from extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
rename to subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
diff --git a/extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java b/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
similarity index 100%
rename from extensions/lib/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
rename to subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
diff --git a/extensions/testing/fakedata/integtests/log4j2-test.xml b/subdomains/excel/integtests/log4j2-test.xml
similarity index 100%
rename from extensions/testing/fakedata/integtests/log4j2-test.xml
rename to subdomains/excel/integtests/log4j2-test.xml
diff --git a/extensions/lib/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
similarity index 80%
rename from extensions/lib/excel/integtests/pom.xml
rename to subdomains/excel/integtests/pom.xml
index 02189ba..eb68439 100644
--- a/extensions/lib/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -4,18 +4,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.subdomains</groupId>
+        <artifactId>isis-subdomains</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-excel-integtests</artifactId>
-    <name>Apache Isis Ext - Excel (Integ Tests)</name>
+    <artifactId>isis-subdomains-excel-integtests</artifactId>
+    <name>Apache Isis Sub - Excel (Integ Tests)</name>
 
 	<properties>
-    	<jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.integtests</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/excel/integtests</git-plugin.propertiesDir>
+    	<jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.integtests</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/integtests</git-plugin.propertiesDir>
         
         <skipTests>true</skipTests>
     </properties>
@@ -56,14 +56,14 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-excel-fixtures</artifactId>
+            <groupId>org.apache.isis.subdomains</groupId>
+            <artifactId>isis-subdomains-excel-fixtures</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fakedata-dom</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fakedata-dom</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -86,8 +86,8 @@
 
 <!--
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-base-dom</artifactId>
+            <groupId>org.apache.isis.subdomains</groupId>
+            <artifactId>isis-subdomains-base-dom</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
diff --git a/extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
similarity index 100%
rename from extensions/lib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
diff --git a/extensions/testing/fakedata/integtests/toDoItems-actual.xlsx b/subdomains/excel/integtests/toDoItems-actual.xlsx
similarity index 100%
rename from extensions/testing/fakedata/integtests/toDoItems-actual.xlsx
rename to subdomains/excel/integtests/toDoItems-actual.xlsx
diff --git a/extensions/lib/excel/integtests/translations.pot b/subdomains/excel/integtests/translations.pot
similarity index 100%
rename from extensions/lib/excel/integtests/translations.pot
rename to subdomains/excel/integtests/translations.pot
diff --git a/extensions/lib/freemarker/impl/pom.xml b/subdomains/freemarker/impl/pom.xml
similarity index 81%
rename from extensions/lib/freemarker/impl/pom.xml
rename to subdomains/freemarker/impl/pom.xml
index 05c3aa7..2f29698 100644
--- a/extensions/lib/freemarker/impl/pom.xml
+++ b/subdomains/freemarker/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-freemarker-dom</artifactId>
-	<name>Apache Isis Ext - Freemarker</name>
+	<artifactId>isis-subdomains-freemarker-dom</artifactId>
+	<name>Apache Isis Sub - Freemarker</name>
 	<description>Integrates Freemarker Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.freemarker.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/freemarker/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.freemarker.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/freemarker/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/antora.yml b/subdomains/freemarker/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/antora.yml
rename to subdomains/freemarker/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/_attributes.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/_attributes.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/_attributes.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/_attributes.adoc
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/partials/_attributes.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/partials/_attributes.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/_attributes.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc
diff --git a/extensions/lib/slack/impl/src/main/doc/modules/slack/pages/_attributes.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/slack/impl/src/main/doc/modules/slack/pages/_attributes.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/_attributes.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc b/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
rename to subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java b/subdomains/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
rename to subdomains/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
diff --git a/extensions/lib/ognl/impl/pom.xml b/subdomains/ognl/impl/pom.xml
similarity index 81%
rename from extensions/lib/ognl/impl/pom.xml
rename to subdomains/ognl/impl/pom.xml
index 8774c6e..c0bb171 100644
--- a/extensions/lib/ognl/impl/pom.xml
+++ b/subdomains/ognl/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-ognl-dom</artifactId>
-	<name>Apache Isis Ext - Ognl</name>
+	<artifactId>isis-subdomains-ognl-dom</artifactId>
+	<name>Apache Isis Sub - Ognl</name>
 	<description>Integrates Ognl Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.ognl.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/ognl/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/freemarker/impl/src/main/doc/antora.yml b/subdomains/ognl/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/antora.yml
rename to subdomains/ognl/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/_attributes.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/_attributes.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/_attributes.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/_attributes.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials/_attributes.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials/_attributes.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/pages/_attributes.adoc
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/pages/_attributes.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/pages/_attributes.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/partials/_attributes.adoc
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
rename to subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
diff --git a/extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java b/subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
rename to subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
diff --git a/extensions/lib/pdfbox/impl/pom.xml b/subdomains/pdfbox/impl/pom.xml
similarity index 81%
rename from extensions/lib/pdfbox/impl/pom.xml
rename to subdomains/pdfbox/impl/pom.xml
index 6d0384e..8d961f4 100644
--- a/extensions/lib/pdfbox/impl/pom.xml
+++ b/subdomains/pdfbox/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-pdfbox-dom</artifactId>
-	<name>Apache Isis Ext - PDF Box</name>
+	<artifactId>isis-subdomains-pdfbox-dom</artifactId>
+	<name>Apache Isis Sub - PDF Box</name>
 	<description>Integrates PDF Box Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.pdfbox.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/pdfbox/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/excel/impl/src/main/doc/antora.yml b/subdomains/pdfbox/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/antora.yml
rename to subdomains/pdfbox/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/_attributes.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/_attributes.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/_attributes.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/_attributes.adoc
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/nav.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/nav.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials/_attributes.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/partials/_attributes.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/_attributes.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc
diff --git a/extensions/lib/ognl/impl/src/main/doc/modules/ognl/pages/_attributes.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/ognl/impl/src/main/doc/modules/ognl/pages/_attributes.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/_attributes.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
rename to subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
diff --git a/extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java b/subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
similarity index 100%
rename from extensions/lib/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
rename to subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
new file mode 100644
index 0000000..13901f9
--- /dev/null
+++ b/subdomains/pom.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.core</groupId>
+		<artifactId>isis</artifactId>
+		<version>2.0.0-M3-SNAPSHOT</version>
+		<relativePath>../core/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.isis.subdomains</groupId>
+	<artifactId>isis-subdomains</artifactId>
+
+	<name>Apache Isis Subdomains</name>
+	<description>
+        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.
+    </description>
+
+	<packaging>pom</packaging>
+
+	<properties>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains</git-plugin.propertiesDir>
+	</properties>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-base-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-excel-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-excel-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-excel-integtests</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-spring</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-xdocreport-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-zip-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<!-- testing -->
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+
+		<module>base/impl</module>
+<!--
+		<module>excel/fixture</module>
+		<module>excel/integtests</module>
+-->
+		<module>excel/impl</module>
+
+		<module>spring/impl</module>
+
+		<module>xdocreport/impl</module>
+		<module>zip/impl</module>
+	</modules>
+
+	<profiles>
+		<profile>
+			<id>isis-app-starter-datanucleusenhance</id>
+			<activation>
+				<file>
+					<exists>${basedir}/logging-dn-enhance.properties</exists>
+				</file>
+			</activation>
+			<properties>
+
+				<!-- keep in sync with versions used in Apache Isis -->
+				<datanucleus-api-jdo.version>5.2.2</datanucleus-api-jdo.version>
+				<datanucleus-core.version>5.2.2</datanucleus-core.version>
+				<datanucleus-jodatime.version>5.2.0-release</datanucleus-jodatime.version>
+				<datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
+
+				<datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
+				<datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
+				<datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
+
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.datanucleus</groupId>
+						<artifactId>datanucleus-maven-plugin</artifactId>
+						<version>${datanucleus-maven-plugin.version}</version>
+						<configuration>
+							<fork>${datanucleus-maven-plugin.fork}</fork>
+							<log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
+							<verbose>${datanucleus-maven-plugin.verbose}</verbose>
+						</configuration>
+						<executions>
+							<execution>
+								<id>process-classes</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>enhance</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>process-test-classes</id>
+								<phase>process-test-classes</phase>
+								<goals>
+									<goal>test-enhance</goal>
+								</goals>
+								<configuration>
+									<metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+								</configuration>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-core</artifactId>
+								<version>${datanucleus-core.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-api-jdo</artifactId>
+								<version>${datanucleus-api-jdo.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-jodatime</artifactId>
+								<version>${datanucleus-jodatime.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+</project>
+
+
diff --git a/extensions/core/spring/pom.xml b/subdomains/spring/impl/pom.xml
similarity index 79%
rename from extensions/core/spring/pom.xml
rename to subdomains/spring/impl/pom.xml
index 56c247a..9fe3cfa 100644
--- a/extensions/core/spring/pom.xml
+++ b/subdomains/spring/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-spring</artifactId>
-	<name>Apache Isis Ext - Spring</name>
-	<description>Utility services for interacting with the Spring application context</description>
+	<artifactId>isis-subdomains-spring</artifactId>
+	<name>Apache Isis Sin - Spring</name>
+	<description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.spring</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/spring</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.spring</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/spring</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/docx/impl/src/main/doc/antora.yml b/subdomains/spring/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/antora.yml
rename to subdomains/spring/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/_attributes.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/_attributes.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/_attributes.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/_attributes.adoc
diff --git a/extensions/core/spring/src/main/doc/modules/spring/nav.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/nav.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/partials/_attributes.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/partials/_attributes.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/pages/_attributes.adoc
diff --git a/extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/pages/about.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc
diff --git a/extensions/lib/minio/impl/src/main/doc/modules/minio/pages/_attributes.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/minio/impl/src/main/doc/modules/minio/pages/_attributes.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/partials/_attributes.adoc
diff --git a/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc b/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
rename to subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java b/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
similarity index 100%
rename from extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
rename to subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
similarity index 100%
rename from extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
rename to subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
similarity index 100%
rename from extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
rename to subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
diff --git a/extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
similarity index 100%
rename from extensions/core/spring/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
rename to subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
diff --git a/extensions/lib/xdocreport/impl/pom.xml b/subdomains/xdocreport/impl/pom.xml
similarity index 89%
rename from extensions/lib/xdocreport/impl/pom.xml
rename to subdomains/xdocreport/impl/pom.xml
index b047e7a..2705705 100644
--- a/extensions/lib/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/impl/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-xdocreport-dom</artifactId>
-	<name>Apache Isis Ext - xdocreport</name>
+	<artifactId>isis-subdomains-xdocreport-dom</artifactId>
+	<name>Apache Isis Sub - xdocreport</name>
 	<description>Integrates XDoc Report Library</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.xdocreport.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/xdocreport/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/xdocreport/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/lib/base/impl/src/main/doc/antora.yml b/subdomains/xdocreport/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/antora.yml
rename to subdomains/xdocreport/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/_attributes.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/_attributes.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/_attributes.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/_attributes.adoc
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/nav.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/nav.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/_attributes.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/_attributes.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/_attributes.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc
diff --git a/extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/_attributes.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/_attributes.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/_attributes.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
rename to subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
rename to subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
rename to subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
rename to subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
diff --git a/extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
rename to subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml
diff --git a/extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java b/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
similarity index 100%
rename from extensions/lib/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
rename to subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
diff --git a/extensions/lib/zip/impl/pom.xml b/subdomains/zip/impl/pom.xml
similarity index 85%
rename from extensions/lib/zip/impl/pom.xml
rename to subdomains/zip/impl/pom.xml
index 2bb64d9..cb9a2e0 100644
--- a/extensions/lib/zip/impl/pom.xml
+++ b/subdomains/zip/impl/pom.xml
@@ -15,14 +15,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.subdomains</groupId>
+		<artifactId>isis-subdomains</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-zip-dom</artifactId>
-	<name>Apache Isis Ext - zip</name>
+	<artifactId>isis-subdomains-zip-dom</artifactId>
+	<name>Apache Isis Sub - Zip</name>
 
 	<description>
 		A domain service for Apache Isis', for zipping utilities.
@@ -30,8 +30,8 @@
 
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.zip.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/zip/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.subdomains.zip.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/subdomains/zip/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
diff --git a/extensions/core/spring/src/main/doc/antora.yml b/subdomains/zip/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/core/spring/src/main/doc/antora.yml
rename to subdomains/zip/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/_attributes.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/_attributes.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/_attributes.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/_attributes.adoc
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/nav.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/nav.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/nav.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/nav.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials/_attributes.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/partials/_attributes.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/pages/_attributes.adoc
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/pages/about.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/pages/about.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/pages/about.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/pages/about.adoc
diff --git a/extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/pages/_attributes.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/freemarker/impl/src/main/doc/modules/freemarker/pages/_attributes.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/partials/_attributes.adoc
diff --git a/extensions/lib/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc b/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
similarity index 100%
rename from extensions/lib/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
rename to subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
diff --git a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java b/subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
similarity index 100%
rename from extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
rename to subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
diff --git a/extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java b/subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
similarity index 100%
rename from extensions/lib/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
rename to subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
diff --git a/extensions/lib/excel/fixture/.gitignore b/testing/fakedata/fixture/.gitignore
similarity index 100%
rename from extensions/lib/excel/fixture/.gitignore
rename to testing/fakedata/fixture/.gitignore
diff --git a/extensions/lib/excel/fixture/logging-dn-enhance.properties b/testing/fakedata/fixture/logging-dn-enhance.properties
similarity index 100%
rename from extensions/lib/excel/fixture/logging-dn-enhance.properties
rename to testing/fakedata/fixture/logging-dn-enhance.properties
diff --git a/extensions/testing/fakedata/fixture/pom.xml b/testing/fakedata/fixture/pom.xml
similarity index 75%
rename from extensions/testing/fakedata/fixture/pom.xml
rename to testing/fakedata/fixture/pom.xml
index a913a97..3a2bf46 100644
--- a/extensions/testing/fakedata/fixture/pom.xml
+++ b/testing/fakedata/fixture/pom.xml
@@ -3,18 +3,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.testing</groupId>
+        <artifactId>isis-testing</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-fakedata-fixtures</artifactId>
-    <name>Apache Isis Ext - FakeData (Fixtures)</name>
+    <artifactId>isis-testing-fakedata-fixtures</artifactId>
+    <name>Apache Isis Testing - FakeData (Fixtures)</name>
 
 	<properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.fakedata.fixtures</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/lib/fakedata/fixtures</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.fixtures</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/fixtures</git-plugin.propertiesDir>
     </properties>
 
     <build>
@@ -55,8 +55,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fakedata-dom</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fakedata-dom</artifactId>
         </dependency>
 
         <dependency>
@@ -65,8 +65,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fixtures</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fixtures</artifactId>
         </dependency>
 
         <dependency>
diff --git a/extensions/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml b/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
rename to testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
diff --git a/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
similarity index 100%
rename from extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
rename to testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
diff --git a/extensions/testing/fakedata/impl/pom.xml b/testing/fakedata/impl/pom.xml
similarity index 85%
rename from extensions/testing/fakedata/impl/pom.xml
rename to testing/fakedata/impl/pom.xml
index 5c76a9b..54beacd 100644
--- a/extensions/testing/fakedata/impl/pom.xml
+++ b/testing/fakedata/impl/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.testing</groupId>
+        <artifactId>isis-testing</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-fakedata-dom</artifactId>
-    <name>Apache Isis Ext - FakeData (Domain)</name>
+    <artifactId>isis-testing-fakedata-dom</artifactId>
+    <name>Apache Isis Testing - FakeData (Domain)</name>
 
     <description>
         A module providing a domain service to generate fake random data
@@ -18,8 +18,8 @@
     </description>
 
     <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.fakedata.dom</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/lib/fakedata/dom</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.dom</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/dom</git-plugin.propertiesDir>
     </properties>
 
     <build>
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/antora.yml b/testing/fakedata/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/antora.yml
rename to testing/fakedata/impl/src/main/doc/antora.yml
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/_attributes.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/_attributes.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/partials/_attributes.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/partials/_attributes.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
diff --git a/extensions/lib/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/partials/_attributes.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc b/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
rename to testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
diff --git a/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc b/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
rename to testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
diff --git a/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java b/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
similarity index 100%
rename from extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
rename to testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
diff --git a/extensions/lib/excel/integtests/log4j2-test.xml b/testing/fakedata/integtests/log4j2-test.xml
similarity index 100%
rename from extensions/lib/excel/integtests/log4j2-test.xml
rename to testing/fakedata/integtests/log4j2-test.xml
diff --git a/extensions/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
similarity index 75%
rename from extensions/testing/fakedata/integtests/pom.xml
rename to testing/fakedata/integtests/pom.xml
index 7fcb8f4..5cf09a0 100644
--- a/extensions/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -4,18 +4,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.testing</groupId>
+        <artifactId>isis-testing</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-fakedata-integtests</artifactId>
-    <name>Apache Isis Ext - FakeData (Integ Tests)</name>
+    <artifactId>isis-testing-fakedata-integtests</artifactId>
+    <name>Apache Isis Testing - FakeData (Integ Tests)</name>
     
     <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.fakedata.integtests</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/lib/fakedata/integtests</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.integtests</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/integtests</git-plugin.propertiesDir>
     </properties>
 
     <build>
@@ -53,14 +53,14 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fakedata-fixtures</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fakedata-fixtures</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.isis.extensions</groupId>
-            <artifactId>isis-extensions-fakedata-dom</artifactId>
+            <groupId>org.apache.isis.testing</groupId>
+            <artifactId>isis-testing-fakedata-dom</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
similarity index 100%
rename from extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
similarity index 100%
rename from extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
diff --git a/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
similarity index 100%
rename from extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
diff --git a/extensions/lib/excel/integtests/toDoItems-actual.xlsx b/testing/fakedata/integtests/toDoItems-actual.xlsx
similarity index 100%
rename from extensions/lib/excel/integtests/toDoItems-actual.xlsx
rename to testing/fakedata/integtests/toDoItems-actual.xlsx
diff --git a/extensions/testing/fakedata/integtests/translations.pot b/testing/fakedata/integtests/translations.pot
similarity index 100%
rename from extensions/testing/fakedata/integtests/translations.pot
rename to testing/fakedata/integtests/translations.pot
diff --git a/extensions/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
similarity index 82%
rename from extensions/testing/fixtures/pom.xml
rename to testing/fixtures/pom.xml
index 358f561..e4b9c9b 100644
--- a/extensions/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.testing</groupId>
+		<artifactId>isis-testing</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-fixtures</artifactId>
-	<name>Apache Isis Ext - Fixtures</name>
+	<artifactId>isis-testing-fixtures</artifactId>
+	<name>Apache Isis Testing - Fixtures</name>
 	<description></description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.fixtures</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/fixtures</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/testing/fixtures</git-plugin.propertiesDir>
 	</properties>
 
 	<build>
@@ -57,8 +57,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>isis-extensions-spring</artifactId>
+			<groupId>org.apache.isis.subdomains</groupId>
+			<artifactId>isis-subdomains-spring</artifactId>
 		</dependency>
 
 		<!-- JDO API (non transient, provided by plugin) -->
diff --git a/extensions/testing/specsupport/src/main/doc/antora.yml b/testing/fixtures/src/main/doc/antora.yml
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/antora.yml
rename to testing/fixtures/src/main/doc/antora.yml
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/_attributes.adoc b/testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/_attributes.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png b/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png b/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png b/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx b/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
rename to testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png b/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png b/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png b/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png b/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
rename to testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc b/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/partials/_attributes.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/partials/_attributes.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc b/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/extensions/lib/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc b/testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc b/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
rename to testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
diff --git a/extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
similarity index 100%
rename from extensions/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
rename to testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
diff --git a/extensions/testing/fixtures/src/main/resources/prism.css b/testing/fixtures/src/main/resources/prism.css
similarity index 100%
rename from extensions/testing/fixtures/src/main/resources/prism.css
rename to testing/fixtures/src/main/resources/prism.css
diff --git a/extensions/testing/fixtures/src/main/resources/prism1.14.js b/testing/fixtures/src/main/resources/prism1.14.js
similarity index 100%
rename from extensions/testing/fixtures/src/main/resources/prism1.14.js
rename to testing/fixtures/src/main/resources/prism1.14.js
diff --git a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java b/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
similarity index 100%
rename from extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
rename to testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
diff --git a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java b/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
similarity index 100%
rename from extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
rename to testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
diff --git a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java b/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
similarity index 100%
rename from extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
rename to testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
diff --git a/extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java b/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
similarity index 100%
rename from extensions/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
rename to testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
diff --git a/testing/pom.xml b/testing/pom.xml
new file mode 100644
index 0000000..2667342
--- /dev/null
+++ b/testing/pom.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.core</groupId>
+		<artifactId>isis</artifactId>
+		<version>2.0.0-M3-SNAPSHOT</version>
+		<relativePath>../core/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.isis.testing</groupId>
+	<artifactId>isis-testing</artifactId>
+
+	<name>Apache Isis Testing</name>
+	<description>
+        A library of utilities, mini-frameworks and tools for prototyping and testing Apache Isis applications.
+    </description>
+
+	<packaging>pom</packaging>
+
+	<properties>
+		<jar-plugin.automaticModuleName>org.apache.isis.testing</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/testing</git-plugin.propertiesDir>
+	</properties>
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+
+			<dependency>
+				<groupId>org.apache.isis.subdomains</groupId>
+				<artifactId>isis-subdomains-spring</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-specsupport</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fakedata-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fakedata-fixtures</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-fakedata-integtests</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.isis.testing</groupId>
+				<artifactId>isis-testing-unittestsupport-dom</artifactId>
+				<version>2.0.0-M3-SNAPSHOT</version>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+
+	<modules>
+		<module>fakedata/impl</module>
+		<module>fakedata/fixture</module>
+		<!--
+                <module>fakedata/integtests</module>
+        -->
+		<module>fixtures</module>
+		<module>specsupport</module>
+		<module>unittestsupport/impl</module>
+	</modules>
+
+	<profiles>
+		<profile>
+			<id>isis-app-starter-datanucleusenhance</id>
+			<activation>
+				<file>
+					<exists>${basedir}/logging-dn-enhance.properties</exists>
+				</file>
+			</activation>
+			<properties>
+
+				<!-- keep in sync with versions used in Apache Isis -->
+				<datanucleus-api-jdo.version>5.2.2</datanucleus-api-jdo.version>
+				<datanucleus-core.version>5.2.2</datanucleus-core.version>
+				<datanucleus-jodatime.version>5.2.0-release</datanucleus-jodatime.version>
+				<datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
+
+				<datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
+				<datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
+				<datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
+
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.datanucleus</groupId>
+						<artifactId>datanucleus-maven-plugin</artifactId>
+						<version>${datanucleus-maven-plugin.version}</version>
+						<configuration>
+							<fork>${datanucleus-maven-plugin.fork}</fork>
+							<log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
+							<verbose>${datanucleus-maven-plugin.verbose}</verbose>
+						</configuration>
+						<executions>
+							<execution>
+								<id>process-classes</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>enhance</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>process-test-classes</id>
+								<phase>process-test-classes</phase>
+								<goals>
+									<goal>test-enhance</goal>
+								</goals>
+								<configuration>
+									<metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+								</configuration>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-core</artifactId>
+								<version>${datanucleus-core.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-api-jdo</artifactId>
+								<version>${datanucleus-api-jdo.version}</version>
+							</dependency>
+							<dependency>
+								<groupId>org.datanucleus</groupId>
+								<artifactId>datanucleus-jodatime</artifactId>
+								<version>${datanucleus-jodatime.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+
+</project>
+
+
diff --git a/extensions/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
similarity index 84%
rename from extensions/testing/specsupport/pom.xml
rename to testing/specsupport/pom.xml
index 62c1687..e4457af 100644
--- a/extensions/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -15,19 +15,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>isis-extensions</artifactId>
+		<groupId>org.apache.isis.testing</groupId>
+		<artifactId>isis-testing</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-specsupport</artifactId>
-	<name>Apache Isis Ext - Spec/Cucumber Support</name>
+	<artifactId>isis-testing-specsupport</artifactId>
+	<name>Apache Isis Testing - Spec/Cucumber Support</name>
 	<description></description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.specsupport</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/specsupport</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/testing/specsupport</git-plugin.propertiesDir>
 
  		<cucumber.impl>io.cucumber</cucumber.impl>
  		<cucumber.version>4.8.0</cucumber.version>
@@ -46,11 +46,11 @@
             <artifactId>isis-webboot-springboot</artifactId>
         </dependency>
         
-        <!-- ISIS EXTENSIONS -->
+        <!-- ISIS TESTING -->
 		
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>isis-extensions-fixtures</artifactId>
+			<groupId>org.apache.isis.testing</groupId>
+			<artifactId>isis-testing-fixtures</artifactId>
 		</dependency>
         
 		<!-- TESTING -->
diff --git a/extensions/testing/fixtures/src/main/doc/antora.yml b/testing/specsupport/src/main/doc/antora.yml
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/antora.yml
rename to testing/specsupport/src/main/doc/antora.yml
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/_attributes.adoc b/testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/_attributes.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc b/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/partials/_attributes.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/partials/_attributes.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
diff --git a/extensions/lib/base/impl/src/main/doc/modules/base/pages/_attributes.adoc b/testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc
similarity index 100%
rename from extensions/lib/base/impl/src/main/doc/modules/base/pages/_attributes.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc b/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
rename to testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
diff --git a/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java b/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
similarity index 100%
rename from extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
rename to testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
diff --git a/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java b/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
similarity index 100%
rename from extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
rename to testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
diff --git a/extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java b/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java
similarity index 100%
rename from extensions/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java
rename to testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java
diff --git a/extensions/testing/unittestsupport/impl/pom.xml b/testing/unittestsupport/impl/pom.xml
similarity index 82%
rename from extensions/testing/unittestsupport/impl/pom.xml
rename to testing/unittestsupport/impl/pom.xml
index fffd7de..2f1f0d1 100644
--- a/extensions/testing/unittestsupport/impl/pom.xml
+++ b/testing/unittestsupport/impl/pom.xml
@@ -3,17 +3,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>isis-extensions</artifactId>
+        <groupId>org.apache.isis.testing</groupId>
+        <artifactId>isis-testing</artifactId>
         <version>2.0.0-M3-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <artifactId>isis-extensions-unittestsupport-dom</artifactId>
+    <artifactId>isis-testing-unittestsupport-dom</artifactId>
 
     <packaging>jar</packaging>
 
-    <name>Apache Isis Ext - Unit Test Support</name>
+    <name>Apache Isis Testing - Unit Test Support</name>
     <description>
         A module providing test utilities for unit testing of domain modules
     </description>
diff --git a/extensions/testing/fakedata/impl/src/main/doc/antora.yml b/testing/unittestsupport/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/antora.yml
rename to testing/unittestsupport/impl/src/main/doc/antora.yml
diff --git a/extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/_attributes.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
similarity index 100%
rename from extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
diff --git a/extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/partials/_attributes.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
diff --git a/extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/_attributes.adoc
similarity index 100%
rename from extensions/core/spring/src/main/doc/modules/spring/pages/_attributes.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/_attributes.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
rename to testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
diff --git a/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
rename to testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
diff --git a/extensions/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java b/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
similarity index 100%
rename from extensions/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
rename to testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java


[isis] 05/05: ISIS-2259: further fix up of antora

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

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

commit 9495f6ff4dd711eb8493fbe484adef1d17f25ab0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 7 19:24:36 2020 +0000

    ISIS-2259: further fix up of antora
---
 .../doc/modules/ROOT/partials/component-nav.adoc   |  1 -
 .../security/secman/api/src/main/doc/antora.yml    |  2 +-
 .../encryption-jbcrypt/src/main/doc/antora.yml     |  2 +-
 .../security/secman/model/src/main/doc/antora.yml  |  2 +-
 .../secman/persistence-jdo/src/main/doc/antora.yml |  2 +-
 .../secman/shiro-realm/src/main/doc/antora.yml     |  2 +-
 extensions/security/secman/src/main/doc/antora.yml |  2 +-
 .../doc/modules/shiro-realm-ldap/pages/about.adoc  |  8 ++---
 site-extensions.yml                                | 35 ++++++++++++++++++++--
 site-incubator.yml                                 |  4 +--
 site-legacy.yml                                    | 11 ++++---
 site-mappings.yml                                  | 13 ++++++++
 site-subdomains.yml                                | 29 ++++++++++++++++++
 site-testing.yml                                   | 13 ++++++--
 site-valuetypes.yml                                | 10 +++++++
 site.yml                                           |  2 +-
 16 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 992cf9c..e56cfd1 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,2 +1 @@
 include::pjdo:ROOT:partial$module-nav.adoc[]
-include::pjdo:flywayjdo:partial$module-nav.adoc[]
diff --git a/extensions/security/secman/api/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/api/src/main/doc/antora.yml
+++ b/extensions/security/secman/api/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
 version: master
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
 version: master
diff --git a/extensions/security/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/model/src/main/doc/antora.yml
+++ b/extensions/security/secman/model/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
 version: master
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
+++ b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
 version: master
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
index eeeeb1e..a6ae987 100644
--- a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
+++ b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: secman
 version: master
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
index b188a2d..88ed3f2 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/extensions/security/secman/src/main/doc/antora.yml
@@ -1,4 +1,4 @@
-name: extensions
+name: secman
 title: "SecMan"
 version: master
 start_page: ROOT:about.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
index 395791c..48d6984 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
@@ -6,10 +6,10 @@ TODO
 
 see `shiro.ini` (example)
 
-[source,properties]
-----
-include::security:shiro-realm-ldap:example$shiro.ini[]
-----
+//[source,properties]
+//----
+//include::security:shiro-realm-ldap:example$shiro.ini[]
+//----
 
 == Setting up Users/Groups in Apache Directory Studio
 
diff --git a/site-extensions.yml b/site-extensions.yml
index d669d53..4ccdfde 100644
--- a/site-extensions.yml
+++ b/site-extensions.yml
@@ -17,13 +17,42 @@ content:
 
 # extensions
     - url: .
-      start_path: extensions/core/spring/src/main/doc # extensions
+      start_path: extensions/persistence/flywayjdo/impl/src/main/doc # extensions
       branches: HEAD
     - url: .
-      start_path: extensions/persistence/h2console/src/main/doc # extensions
+      start_path: extensions/persistence/h2console/impl/src/main/doc # extensions
       branches: HEAD
     - url: .
-      start_path: extensions/persistence/hsqldbmgr/src/main/doc # extensions
+      start_path: extensions/persistence/hsqldbmgr/impl/src/main/doc # extensions
+      branches: HEAD
+
+    - url: .
+      start_path: extensions/security/secman/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/secman/api/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/secman/model/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/secman/shiro-realm/src/main/doc # security
+      branches: HEAD
+    - url: .
+      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
+      branches: HEAD
+
+    - url: .
+      start_path: extensions/vro/cors/src/main/doc # vro
+      branches: HEAD
+    - url: .
+      start_path: extensions/vw/exceldownload/src/main/doc # vw
       branches: HEAD
 
 
diff --git a/site-incubator.yml b/site-incubator.yml
index 64189c4..bf2ebbb 100644
--- a/site-incubator.yml
+++ b/site-incubator.yml
@@ -17,10 +17,10 @@ content:
 
 # incubator
     - url: .
-      start_path: incubator/core/model/src/main/doc # incubator
+      start_path: incubator/extensions/core/model/src/main/doc # incubator
       branches: HEAD
     - url: .
-      start_path: incubator/core/microprofile/src/main/doc # incubator
+      start_path: incubator/extensions/core/microprofile/src/main/doc # incubator
       branches: HEAD
 
 
diff --git a/site-legacy.yml b/site-legacy.yml
index c6eef96..47e6b91 100644
--- a/site-legacy.yml
+++ b/site-legacy.yml
@@ -17,16 +17,19 @@ content:
 
 # legacy
     - url: .
-      start_path: legacy/core/applib/src/main/doc # legacy
+      start_path: legacy/extensions/core/applib/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/core/commons/src/main/doc # legacy
+      start_path: legacy/extensions/core/commons/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/core/runtime/src/main/doc # legacy
+      start_path: legacy/extensions/core/runtime/src/main/doc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/vro/restclient/src/main/doc # legacy
+      start_path: legacy/mappings/restclient/src/main/doc # legacy
+      branches: HEAD
+    - url: .
+      start_path: legacy/subdomains/servletapi/impl/src/main/doc # legacy
       branches: HEAD
 
 
diff --git a/site-mappings.yml b/site-mappings.yml
index 489bb56..5d5a27f 100644
--- a/site-mappings.yml
+++ b/site-mappings.yml
@@ -15,6 +15,19 @@ content:
       start_path: antora/components/mappings # mappings
       branches: HEAD
 
+    # mappings
+    - url: .
+      start_path: mappings/jaxrsclient/impl/src/main/doc # mappings
+      branches: HEAD
+    - url: .
+      start_path: mappings/minio/impl/src/main/doc # mappings
+      branches: HEAD
+    - url: .
+      start_path: mappings/restclient/impl/src/main/doc # mappings
+      branches: HEAD
+    - url: .
+      start_path: mappings/slack/impl/src/main/doc # mappings
+      branches: HEAD
 
 
 ui:
diff --git a/site-subdomains.yml b/site-subdomains.yml
index b9b0b62..cda7ae8 100644
--- a/site-subdomains.yml
+++ b/site-subdomains.yml
@@ -15,6 +15,35 @@ content:
       start_path: antora/components/subdomains # subdomains
       branches: HEAD
 
+    # subdomains
+    - url: .
+      start_path: subdomains/base/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/docx/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/excel/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/freemarker/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/ognl/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/spring/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+      branches: HEAD
+    - url: .
+      start_path: subdomains/zip/impl/src/main/doc # subdomains
+      branches: HEAD
+
 
 
 ui:
diff --git a/site-testing.yml b/site-testing.yml
index dc9cf85..0db27cc 100644
--- a/site-testing.yml
+++ b/site-testing.yml
@@ -23,13 +23,20 @@ content:
       start_path: core/testsupport/integtestsupport/src/main/doc # testing
       branches: HEAD
 
-# extensions
+# testing
     - url: .
-      start_path: extensions/testing/fixtures/src/main/doc # testing
+      start_path: testing/fakedata/impl/src/main/doc # testing
       branches: HEAD
     - url: .
-      start_path: extensions/testing/specsupport/src/main/doc # testing
+      start_path: testing/fixtures/src/main/doc # testing
       branches: HEAD
+    - url: .
+      start_path: testing/specsupport/src/main/doc # testing
+      branches: HEAD
+    - url: .
+      start_path: testing/unittestsupport/impl/src/main/doc # testing
+      branches: HEAD
+
 
 
 ui:
diff --git a/site-valuetypes.yml b/site-valuetypes.yml
index d2a1ba2..8684020 100644
--- a/site-valuetypes.yml
+++ b/site-valuetypes.yml
@@ -15,6 +15,16 @@ content:
       start_path: antora/components/valuetypes # valuetypes
       branches: HEAD
 
+    # valuetypes
+    - url: .
+      start_path: valuetypes/asciidoc/src/main/doc # vw
+      branches: HEAD
+    - url: .
+      start_path: valuetypes/markdown/src/main/doc # vw
+      branches: HEAD
+    - url: .
+      start_path: valuetypes/sse/src/main/doc # vw
+      branches: HEAD
 
 
 ui:
diff --git a/site.yml b/site.yml
index 5ecaf0d..8868783 100644
--- a/site.yml
+++ b/site.yml
@@ -250,7 +250,7 @@ content:
       start_path: testing/unittestsupport/impl/src/main/doc # testing
       branches: HEAD
 
-    # valuetypes
+# valuetypes
     - url: .
       start_path: valuetypes/asciidoc/src/main/doc # vw
       branches: HEAD