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 2019/12/18 07:52:47 UTC

[isis] 25/25: ISIS-2062: docs for extensions

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 cbf1f96c36e02d6d43a6593c24826e2d42a2c29f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 18 08:31:49 2019 +0100

    ISIS-2062: docs for extensions
---
 .../modules/ROOT/partials/component-nav.adoc       |   7 ++--
 .../security/modules/ROOT/pages/about.adoc         |   2 +-
 .../modules/ROOT/partials/component-nav.adoc       |   6 ----
 .../modules/ROOT/partials/component-nav.adoc       |   4 +--
 .../components/toc/modules/ROOT/pages/about.adoc   |   4 +--
 .../toc/modules/ROOT/pages/downloads/how-to.adoc   |   2 +-
 .../ROOT/pages/landing-page}/_attributes.adoc      |   2 +-
 .../ROOT/pages/{ => landing-page}/components.adoc  |   0
 .../extension-catalog.adoc}                        |  12 ++++++-
 .../ROOT/pages/{ => landing-page}/guides.adoc      |   2 +-
 .../ROOT/pages/{ => landing-page}/internal.adoc    |   0
 .../ROOT/pages/{ => landing-page}/quick-start.adoc |  14 +++++---
 .../modules/ROOT/pages/landing-page/releases.adoc  |  37 +++++++++++++++++++++
 .../ROOT/pages/{ => landing-page}/support.adoc     |   0
 .../ROOT/pages/more-thanks/more-thanks.adoc        |   2 +-
 .../what-is-apache-isis/common-use-cases.adoc      |   2 +-
 .../what-is-apache-isis/screencasts-older.adoc     |   4 +--
 .../pages/what-is-apache-isis/screencasts.adoc     |   2 +-
 .../toc/modules/ROOT/partials/module-nav.adoc      |   4 +--
 .../modules/comguide/pages/verifying-releases.adoc |   2 +-
 .../pages/hints-and-tips/datanucleus-enhancer.adoc |   4 +--
 .../pages/hints-and-tips/enabling-logging.adoc     |   2 +-
 .../how-run-fixtures-on-app-startup.adoc           |   2 +-
 .../toc/modules/devguide/pages/ide/eclipse.adoc    |   4 +--
 .../modules/btb/pages/deployment/neo4j.adoc        |   4 +--
 .../userguide/modules/btb/pages/i18n.adoc          |   2 +-
 .../userguide/modules/fun/pages/about.adoc         |   2 +-
 .../core-concepts/philosophy/how-eases-ddd.adoc    |   2 +-
 .../fun/pages/programming-model/properties.adoc    |   2 +-
 antora/supplemental-ui/index.html                  |  11 +++---
 .../pages/classes/AppManifest-bootstrapping.adoc   |   2 +-
 .../services/acceptheader/AcceptHeaderService.java |   7 ++--
 .../examples/services/command/CommandContext.java  |   2 --
 .../services/command/spi/CommandService.java       |   8 +++--
 .../services/iactn/InteractionContext.java         |  13 +++-----
 .../AcceptHeaderService.adoc                       |   6 ++--
 .../FixtureScriptsSpecificationProvider.adoc       |   2 +-
 .../config/pages/specifying-components.adoc        |   2 +-
 .../jdo/src/main/doc/modules/ROOT/nav.adoc         |   5 +--
 .../disabling-persistence-by-reachability.adoc     |   2 +-
 .../ROOT/pages/configuring/persistence-xml.adoc    |   2 +-
 .../doc/modules/ROOT/partials/component-nav.adoc   |   2 ++
 .../ROOT/{nav.adoc => partials/module-nav.adoc}    |   0
 .../pages/about/configuring-isis-to-use-shiro.adoc |   4 +--
 .../doc/modules/shiro/pages/about/ini-realm.adoc   |   2 +-
 .../pages/integ-test-support/bootstrapping.adoc    |   2 +-
 .../integ-test-support/maven-configuration.adoc    |   6 ++--
 .../unit-test-support/maven-configuration.adoc     |   6 ++--
 .../doc/modules/ROOT/pages/layout-resources.adoc   |   4 +--
 .../doc/modules/ROOT/pages/layout/file-based.adoc  |   2 +-
 .../doc/modules/spring/partials/module-nav.adoc    |   2 +-
 .../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    |   2 +-
 .../doc/modules/base/partials}/_attributes.adoc    |   0
 .../main/doc/modules/base/partials/module-nav.adoc |   3 ++
 .../h2console => lib/docx/impl}/pom.xml            |  20 +++--------
 .../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    |   2 +-
 .../doc/modules/docx/partials}/_attributes.adoc    |   0
 .../main/doc/modules/docx/partials/module-nav.adoc |   3 ++
 .../extensions/docx/dom/IsisModuleExtDocx.java}    |   7 ++--
 .../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   |   2 +-
 .../doc/modules/excel}/partials/_attributes.adoc   |   0
 .../doc/modules/excel/partials/module-nav.adoc     |   3 ++
 .../{h2console => flywayjdo/impl}/pom.xml          |  22 ++++--------
 .../flywayjdo/impl/src/main/doc/antora.yml         |   2 ++
 .../main/doc/modules/flywayjdo}/_attributes.adoc   |   0
 .../impl/src/main/doc/modules/flywayjdo}/nav.adoc  |   0
 .../doc/modules/flywayjdo/pages}/_attributes.adoc  |   0
 .../main/doc/modules/flywayjdo}/pages/about.adoc   |   2 +-
 .../modules/flywayjdo}/partials/_attributes.adoc   |   0
 .../doc/modules/flywayjdo/partials/module-nav.adoc |   3 ++
 .../flywayjdo/dom/IsisModuleExtFlywayJdo.java}     |   7 ++--
 .../persistence/h2console/{ => impl}/pom.xml       |   2 +-
 .../impl}/src/main/doc/antora.yml                  |   0
 .../main/doc/modules/h2console}/_attributes.adoc   |   0
 .../src/main/doc/modules/h2console/nav.adoc        |   0
 .../doc/modules/h2console/pages}/_attributes.adoc  |   0
 .../main/doc/modules/h2console/pages/about.adoc    |   0
 .../modules/h2console}/partials/_attributes.adoc   |   0
 .../doc/modules/h2console/partials/module-nav.adoc |   3 ++
 .../h2console/dom/IsisModuleExtH2Console.java      |   0
 .../h2console/dom/services/H2ManagerMenu.java      |   0
 .../dom/webmodule/WebModuleH2Console.java          |   0
 .../doc/modules/h2console/partials/module-nav.adoc |   3 --
 .../persistence/hsqldbmgr/{ => impl}/pom.xml       |   2 +-
 .../hsqldbmgr/{ => impl}/src/main/doc/antora.yml   |   0
 .../main/doc/modules/hsqldbmgr/_attributes.adoc    |   0
 .../src/main/doc/modules/hsqldbmgr/nav.adoc        |   0
 .../doc/modules/hsqldbmgr/pages}/_attributes.adoc  |   0
 .../main/doc/modules/hsqldbmgr/pages/about.adoc    |   0
 .../modules/hsqldbmgr/partials/_attributes.adoc    |   0
 .../doc/modules/hsqldbmgr/partials/module-nav.adoc |   3 ++
 .../hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java      |   0
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java  |   0
 .../doc/modules/hsqldbmgr/partials/module-nav.adoc |   3 --
 extensions/pom.xml                                 |  32 ++++++++++--------
 .../{lib => testing}/fakedata/fixture/.gitignore   |   0
 .../fakedata/fixture/logging-dn-enhance.properties |   0
 .../{lib => testing}/fakedata/fixture/pom.xml      |   0
 .../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
 extensions/{lib => testing}/fakedata/impl/pom.xml  |   0
 .../testing/fakedata/impl/src/main/doc/antora.yml  |   2 ++
 .../main/doc/modules/fakedata}/_attributes.adoc    |   0
 .../impl/src/main/doc/modules/fakedata/nav.adoc    |   2 ++
 .../doc/modules/fakedata/pages}/_attributes.adoc   |   0
 .../main/doc/modules/fakedata}/pages/about.adoc    |   2 +-
 .../modules/fakedata}/partials/_attributes.adoc    |   0
 .../doc/modules/fakedata/partials/module-nav.adoc  |   3 ++
 .../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
 .../{lib => testing}/fakedata/integtests/pom.xml   |   0
 .../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
 .../pages/fixture-scripts/api-and-usage.adoc       |  10 +++---
 .../bdd-spec-support/maven-configuration.adoc      |   2 +-
 .../pages/bdd-spec-support/writing-a-bdd-spec.adoc |   4 +--
 .../{lib => testing}/unittestsupport/impl/pom.xml  |   0
 .../unittestsupport/impl/src/main/doc/antora.yml   |   2 ++
 .../unit-test-support-ext}/_attributes.adoc        |   0
 .../doc/modules/unit-test-support-ext/nav.adoc     |   2 ++
 .../unit-test-support-ext/pages}/_attributes.adoc  |   0
 .../unit-test-support-ext}/pages/about.adoc        |   5 ++-
 .../partials/_attributes.adoc                      |   0
 .../unit-test-support-ext/partials/module-nav.adoc |   3 ++
 .../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
 .../src/main/doc/modules/mvn/pages/intro.adoc      |   4 +--
 .../src/main/doc/modules/mvn/pages/validate.adoc   |   2 +-
 site.yml                                           |  26 +++++++++++++--
 .../main/doc/modules/helloworld/pages/about.adoc   |   4 +--
 .../main/doc/modules/simpleapp/pages/about.adoc    |   6 ++--
 261 files changed, 252 insertions(+), 177 deletions(-)

diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index da21bef..d0e307b 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -3,8 +3,7 @@ include::extensions:spring:partial$module-nav.adoc[]
 include::extensions:h2console:partial$module-nav.adoc[]
 include::extensions:hsqldbmgr:partial$module-nav.adoc[]
 
-//include::extensions:base:partial$module-nav.adoc[]
-//include::extensions:excel:partial$module-nav.adoc[]
-//include::extensions:fakedata:partial$module-nav.adoc[]
-//include::extensions:unittestsupport:partial$module-nav.adoc[]
+include::extensions:base:partial$module-nav.adoc[]
+include::extensions:docx:partial$module-nav.adoc[]
+include::extensions:excel:partial$module-nav.adoc[]
 
diff --git a/antora/components/security/modules/ROOT/pages/about.adoc b/antora/components/security/modules/ROOT/pages/about.adoc
index b30b7f5..d5072b4 100644
--- a/antora/components/security/modules/ROOT/pages/about.adoc
+++ b/antora/components/security/modules/ROOT/pages/about.adoc
@@ -33,7 +33,7 @@ Shiro in turn uses the concept of a _realm_ as a source for both authentication
 WARNING: TODO: v2: Spring Boot requires that shiro.ini is on classpath, not in WEB-INF.
 
 Shiro ships with a simple text-based realm -- the `IniRealm` -- which reads users (and password), user roles and role permissions from the `WEB-INF/shiro.ini` file.
-The xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp] archetypes are both configured to use this realm.
+The link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes are both configured to use this realm.
 
 Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups.
 Apache Isis in turn extends this with its `IsisLdapRealm`, which provides more flexibility for both group/role and role/permissions management.
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index febbe3a..45e6069 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -1,15 +1,9 @@
 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
diff --git a/antora/components/testing/modules/ROOT/partials/component-nav.adoc b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
index 44234b8..dba568c 100644
--- a/antora/components/testing/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
@@ -1,9 +1,9 @@
-// the navs of all modules in this component use this file as their own nav's.
-
 include::testing:ROOT:partial$module-nav.adoc[]
 include::testing:unit-test-support:partial$module-nav.adoc[]
+include::testing:unit-test-support-ext:partial$module-nav.adoc[]
 include::testing:integ-test-support:partial$module-nav.adoc[]
 include::testing:specsupport:partial$module-nav.adoc[]
 include::testing:fixtures:partial$module-nav.adoc[]
+include::testing:fakedata:partial$module-nav.adoc[]
 
 
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index b299ec9..8f25875 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -22,8 +22,8 @@ include::_attributes.adoc[]
 [discrete]
 == Starter Apps
 
-* xref:starters:helloworld:about.adoc[Hello World]
-* xref:starters:simpleapp:about.adoc[SimpleApp]
+* link:https://github.com/apache/isis-app-helloworld[Hello World]
+* link:https://github.com/apache/isis-app-simpleapp[SimpleApp]
 
 |
 [discrete]
diff --git a/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc b/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
index ff16927..d8268c5 100644
--- a/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
+++ b/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
@@ -13,7 +13,7 @@ Use for prototyping or production.
 
 == Getting Started
 
-If you just want to get going quickly, we suggest using our xref:starters:simpleapp:about.adoc[Maven archetype].
+If you just want to get going quickly, we suggest using our link:https://github.com/apache/isis-app-simpleapp[Maven archetype].
 
 
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/_attributes.adoc
similarity index 81%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
copy to antora/components/toc/modules/ROOT/pages/landing-page/_attributes.adoc
index e8ada7c..d011536 100644
--- a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/_attributes.adoc
@@ -1,4 +1,4 @@
 ifndef::env-site,env-github[]
-:moduledir: ..
+:moduledir: ../..
 include::{moduledir}/_attributes.adoc[]
 endif::[]
diff --git a/antora/components/toc/modules/ROOT/pages/components.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/components.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/components.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/components.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/extensions.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/extension-catalog.adoc
similarity index 75%
rename from antora/components/toc/modules/ROOT/pages/extensions.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/extension-catalog.adoc
index 01bdad8..2599e3a 100644
--- a/antora/components/toc/modules/ROOT/pages/extensions.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/extension-catalog.adoc
@@ -1,4 +1,4 @@
-= Extensions
+= Extension 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[]
 
@@ -10,4 +10,14 @@ The remainder can be found in the:
 
 * 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
+
+* xref:legacy:ROOT:about.adoc[Legacy Catalog]
++
+Functionality that has been deprecated or has become defunct, and which is likely to be removed in future versions.
+
 
diff --git a/antora/components/toc/modules/ROOT/pages/guides.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
similarity index 95%
rename from antora/components/toc/modules/ROOT/pages/guides.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
index 0b294f7..d22478e 100644
--- a/antora/components/toc/modules/ROOT/pages/guides.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
@@ -6,7 +6,7 @@ This page lists the user and reference guides available for developers to create
 
 
 * xref:userguide:ROOT:about.adoc[User Guide] (Fundamentals & Beyond)
-* xref:refguide:ROOT/about.adoc[Reference Guide]
+* xref:refguide:ROOT:about.adoc[Reference Guide]
 * xref:security:ROOT:about.adoc[Security]
 * xref:testing:ROOT:about.adoc[Testing & Prototyping]
 
diff --git a/antora/components/toc/modules/ROOT/pages/internal.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/internal.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/quick-start.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/quick-start.adoc
similarity index 54%
rename from antora/components/toc/modules/ROOT/pages/quick-start.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/quick-start.adoc
index 41f46d6..1207afd 100644
--- a/antora/components/toc/modules/ROOT/pages/quick-start.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/quick-start.adoc
@@ -2,9 +2,15 @@
 :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[]
 
-This page links to the two Maven archetypes that you can use to get started with your application.
+To get started with a new application, use one of the two git repos on Github that provide a starter app.
 
-== Starter Apps
+* link:https://github.com/apache/isis-app-helloworld[HelloWorld]
++
+This is a very minimal app, intended just as a starting point to learn what the framework is all about.
+
+* link:https://github.com/apache/isis-app-simpleapp[Simple App]
++
+This app has the same functionality as _HelloWorld_, but is structured so it can be used as a starting point for developing your own applications.
++
+It also includes some xref:testing:integ-test-support[integration tests], xref:testing:fixtures:about.adoc[fixtures], and xref:testing:spec-support[BDD (Cucumber)] specs.
 
-* xref:starters:helloworld:about.adoc[HelloWorld]
-* xref:starters:simpleapp:about.adoc[SimpleApp]
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
new file mode 100644
index 0000000..a1c0159
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
@@ -0,0 +1,37 @@
+= Releases
+: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[]
+
+
+The easiest way to consume the framework is to use one of the xref:toc:ROOT:landing-page/quick-start.adoc[starter apps].
+Then, just update the `<version>` of the parent starter:
+
+[source,xml]
+----
+<parent>
+    <groupId>org.apache.isis.app</groupId>
+    <artifactId>isis-app-starter-parent</artifactId>
+    <version>2.0.0</version>                            <!--1-->
+</parent>
+----
+<1> update as required.
+
+If you want though you can also xref:toc:ROOT:downloads/how-to.adoc[download] the source code and build it directly.
+
+For each release, consult:
+
+* xref:toc:relnotes:about.adoc[Release Notes]
++
+to learn about new features, improvements and bug fixes
+
+* xref:toc:mignotes:about.adoc[Migration Notes]
++
+to learn how to migrate to new features / away from deprecated or removed features.
+
+If you like to live on the bleeding edge, there are also nightly builds of the framework.
+
+* link:https://github.com/apache-isis-committers/isis-nightly[CI]
+* link:https://repo.incode.cloud/[Maven Repo]
+* link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
+
+Although these are maintained and used by the framework's committers, do be aware that *these are _not_ official ASF releases*; they are provided as a convenience only.
diff --git a/antora/components/toc/modules/ROOT/pages/support.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/support.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc b/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
index f30f66b..bdf76d8 100644
--- a/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
+++ b/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
@@ -24,7 +24,7 @@ In addition to the http://www.apache.org/foundation/thanks.html[support given to
 
 
 |image::more-thanks/icons8-logo.png[link="http://icons8.com"]
-|Icons8, for selected icons on this website and in the link:https://github.com/apache/isis/tree/master/example/application/simpleapp/dom/src/main/resources/images[simpleapp] used to generate the xref:starters:simpleapp:about.adoc[simpleapp archetype]
+|Icons8, for selected icons on this website and in the link:https://github.com/apache/isis/tree/master/example/application/simpleapp/dom/src/main/resources/images[simpleapp] used to generate the link:https://github.com/apache/isis-app-simpleapp[simpleapp archetype]
 
 |===
 
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
index 9bc860e..6198373 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
@@ -22,7 +22,7 @@ Once you've sketched out your domain model, you can then either start-over using
 One of the original motivations for Apache Isis itself was to be able automatically generate a user interface for a domain object model.
 
 Apache Isis' has a pluggable architecture allowing different user interface technologies.
- The principal implementation (as configured by the xref:starters:simpleapp:about.adoc[SimpleApp archetype]) is the xref:vw:ROOT:about.adoc[Wicket viewer].
+ The principal implementation (as configured by the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]) is the xref:vw:ROOT:about.adoc[Wicket viewer].
   This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components.
 Some third-party components can be found in the (non-ASF) link:https://platform.incode.org[Incode Platform^].
 
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
index 35bd9ec..21dce06 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
@@ -81,7 +81,7 @@ Learn more xref:toc:devguide:about.adoc#intellij[here]
 
 |Commands and Auditing (v1.6.0) +
 
-_Configuring the command and auditing add-on modules for the xref:starters:simpleapp:about.adoc[SimpleApp]._ +
+_Configuring the command and auditing add-on modules for the link:https://github.com/apache/isis-app-simpleapp[SimpleApp]._ +
 
 Learn more at the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s command and audit SPI modules
 
@@ -90,7 +90,7 @@ Learn more at the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s
 
 |Security (v1.6.0) +
 
-_Configuring the security add-on module for for the xref:starters:simpleapp:about.adoc[SimpleApp]._ +
+_Configuring the security add-on module for for the link:https://github.com/apache/isis-app-simpleapp[SimpleApp]._ +
 
 Learn more at the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s security SPI module.
 
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index a16bcf3..7d86993 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -45,7 +45,7 @@ Searching and using the Apache Isis docs
 
 
 |link:https://www.youtube.com/watch?v=OTNHR5EdAs8[001^] +
-Generating an app using the xref:starters:simpleapp:about.adoc[SimpleApp archetype]
+Generating an app using the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]
 
 |x||||||||||
 
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
index da62376..a2e3b3f 100644
--- a/antora/components/toc/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
@@ -7,8 +7,8 @@
 
 * Starter Apps
 
-** xref:starters:helloworld:about.adoc[HelloWorld]
-** xref:starters:simpleapp:about.adoc[SimpleApp]
+** link:https://github.com/apache/isis-app-helloworld[HelloWorld]
+** link:https://github.com/apache/isis-app-simpleapp[SimpleApp]
 
 * Demos & Tutorials
 
diff --git a/antora/components/toc/modules/comguide/pages/verifying-releases.adoc b/antora/components/toc/modules/comguide/pages/verifying-releases.adoc
index 52eb4c6..892b9f7 100644
--- a/antora/components/toc/modules/comguide/pages/verifying-releases.adoc
+++ b/antora/components/toc/modules/comguide/pages/verifying-releases.adoc
@@ -134,7 +134,7 @@ Alternatively, you can xref:toc:comguide:verifying-releases.adoc#casting-a-vote[
 
 == (Optional) Verifying binary artifacts
 
-You can verify the binary releases by configuring your local Maven install to point to the Maven staging repository (or repositories) and then using them, eg to run the xref:starters:helloworld:about.adoc[HelloWorld archetype] or the xref:starters:simpleapp:about.adoc[SimpleApp archetype] and running the resultant app.
+You can verify the binary releases by configuring your local Maven install to point to the Maven staging repository (or repositories) and then using them, eg to run the link:https://github.com/apache/isis-app-helloworld[HelloWorld archetype] or the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] and running the resultant app.
 
 Configuring your local Maven install amounts to updating the `~/.m2/settings.xml` file:
 
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc b/antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
index 2d2377c..9efd0f3 100644
--- a/antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
+++ b/antora/components/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
@@ -20,7 +20,7 @@ What this means is that the enhancer -- available as both a Maven plugin and as
 
 If working from the Maven command line, JDO enhancement is done using the `datanucleus-maven-plugin`.
 
-Both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp] Maven archetypes generate applications that have this plugin pre-configured.
+Both the link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp] Maven archetypes generate applications that have this plugin pre-configured.
 
 
 
@@ -41,7 +41,7 @@ It's also a good idea to ensure that every domain module(s) containing entities
 ----
 <1> change as required; typically is the name of the domain module.
 
-Again, the applications generated by both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[Simpleapp] Maven archetypes do this.
+Again, the applications generated by both the link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[Simpleapp] Maven archetypes do this.
 
 
 [WARNING]
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc b/antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
index ca5f712..1552893 100644
--- a/antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
+++ b/antora/components/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
@@ -18,7 +18,7 @@ As per the http://www.datanucleus.org/products/accessplatform/logging.html[DN lo
 * In the JDBC Driver +
 +
 Configure `log4jdbc` JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`).
-There are examples of both in the xref:starters:simpleapp:about.adoc[SimpleApp archetype].
+There are examples of both in the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype].
 
 * In the database +
 +
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc b/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
index f3664e5..23493f4 100644
--- a/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
+++ b/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
@@ -14,7 +14,7 @@ Use events?_
 
 
 The standard approach is to use xref:fixtures:ROOT:about.adoc[fixture scripts].
-These can be run in on start-up typically by being specified in the xref:refguide:applib-cm:classes/AppManifest-bootstrapping.adoc[`AppManifest`], see for example the xref:starters:simpleapp:about.adoc[SimpleApp archetype].
+These can be run in on start-up typically by being specified in the xref:refguide:applib-cm:classes/AppManifest-bootstrapping.adoc[`AppManifest`], see for example the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype].
 
 Alternatively just set `isis.fixtures` and `isis.persistor.datanucleus.install-fixtures` properties.
 
diff --git a/antora/components/toc/modules/devguide/pages/ide/eclipse.adoc b/antora/components/toc/modules/devguide/pages/ide/eclipse.adoc
index eb4c0f8..2fb6972 100644
--- a/antora/components/toc/modules/devguide/pages/ide/eclipse.adoc
+++ b/antora/components/toc/modules/devguide/pages/ide/eclipse.adoc
@@ -38,7 +38,7 @@ To install, download each XML file, then go to `Windows > Preferences > Java > E
 
 == Install Project Lombok
 
-The xref:starters:simpleapp:about.adoc[SimpleApp archetype] uses link:http://projectlombok.org[Project Lombok] annotations (`@Getter` and `@Setter` and so on) to reduce the boilerplate.
+The link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] uses link:http://projectlombok.org[Project Lombok] annotations (`@Getter` and `@Setter` and so on) to reduce the boilerplate.
 For Eclipse IDE this requires an link:https://projectlombok.org/setup/eclipse[installation step]:
 
 * Locate the `lombok.jar` jar file:
@@ -120,7 +120,7 @@ DataNucleus' enhancer uses the domain object model's own classpath to reference
 So, even though your domain objects are unlikely to depend on DataNucleus, these references must still be present.
 
 See the section in xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[DataNucleus enhancer] for details of the contents of the `pom.xml`.
-Chances are it is already set up from running the xref:starters:helloworld:about.adoc[HelloWorld] or the xref:starters:simpleapp:about.adoc[SimpleApp] archetype.
+Chances are it is already set up from running the link:https://github.com/apache/isis-app-helloworld[HelloWorld] or the link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetype.
 
 
 Then, tell DataNucleus to use the project classpath:
diff --git a/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc b/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
index 2d094e2..a9eeb86 100644
--- a/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
+++ b/antora/components/userguide/modules/btb/pages/deployment/neo4j.adoc
@@ -46,14 +46,14 @@ Add the following dependency to the `webapp` project's `pom.xml`:
 <1> for Isis v1.9.0, use the value shown.
 For Isis v1.8.0, use 3.2.3.
 
-In the xref:starters:simpleapp:about.adoc[SimpleApp archetype] this is defined under the "neo4j" profile so can be activated using `-P neo4j`.
+In the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] this is defined under the "neo4j" profile so can be activated using `-P neo4j`.
 
 
 == Try it out!
 
 If you want to quickly try out neo4j for yourself:
 
-* run the xref:starters:simpleapp:about.adoc[SimpleApp archetype] (v1.8.0)
+* run the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] (v1.8.0)
 
 * build the app:
 
diff --git a/antora/components/userguide/modules/btb/pages/i18n.adoc b/antora/components/userguide/modules/btb/pages/i18n.adoc
index 30b542c..859816a 100644
--- a/antora/components/userguide/modules/btb/pages/i18n.adoc
+++ b/antora/components/userguide/modules/btb/pages/i18n.adoc
@@ -129,7 +129,7 @@ Moreover, these messages must be captured in the `.pot` file such that they can
 The first part of the puzzle is tackled by an extension to Apache Isis' programming model.
 Whereas previously the `disableXxx()` / `validateXxx()` / `title()` methods could only return a `java.lang.String`, they may now optionally return a `TranslatableString` (defined in Isis applib) instead.
 
-Here's a (silly) example from the xref:starters:simpleapp:about.adoc[SimpleApp archetype]:
+Here's a (silly) example from the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]:
 
 [source,java]
 ----
diff --git a/antora/components/userguide/modules/fun/pages/about.adoc b/antora/components/userguide/modules/fun/pages/about.adoc
index dd761ed..bc73aa0 100644
--- a/antora/components/userguide/modules/fun/pages/about.adoc
+++ b/antora/components/userguide/modules/fun/pages/about.adoc
@@ -2,7 +2,7 @@
 :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[]
 
-This guide introduces the xref:userguide:fun:core-concepts.adoc[core concepts] and the xref:userguide:fun:building-blocks.adoc[building blocks] of Apache Isis, and tells you how to get started with the xref:starters:helloworld:about.adoc[helloworld starter app].
+This guide introduces the xref:userguide:fun:core-concepts.adoc[core concepts] and the xref:userguide:fun:building-blocks.adoc[building blocks] of Apache Isis, and tells you how to get started with the link:https://github.com/apache/isis-app-helloworld[helloworld starter app].
 
 It describes in some detail the conventions of Apache Isis' xref:userguide:fun:programming-model.adoc[programming model]s, describes how to influence the xref:vw:ROOT:layout.adoc[UI layout] of your domain objects , and it catalogues various xref:toc:devguide:hints-and-tips.adoc.adoc[FAQ]s.
 
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
index 2410875..05239e1 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
@@ -54,7 +54,7 @@ If we are using code as the primary means of expressing the model, then we need
 We could generate UML diagrams and the like from code. That will work for some members of the business community, but not for everyone. Or we could generate a PDF document from Javadoc comments, but comments aren't code and so the document may be inaccurate.  Anyway, even if we do create such a document, not everyone will read it.
 
 A better way to represent the model is to show it in action as a working prototype.
-As we show in the xref:starters:helloworld:about.adoc[Getting Started] section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
+As we show in the link:https://github.com/apache/isis-app-helloworld[Getting Started] section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
 
 Moreover, with Apache Isis prototypes, the domain model will come shining through. If there are mistakes or misunderstandings in the domain model (inevitable when building any complex system), they will be obvious to all.
 
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc b/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
index 7f7c70a..0116771 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/properties.adoc
@@ -26,7 +26,7 @@ It's also possible (using annotations) to define a link table to hold foreign ke
 Apache Isis recognises some of these annotations for JDO/DataNucleus and JAXB and infers some domain semantics from them (for example, the maximum allowable length of a string property).
 
 Since writing getter and setter methods adds quite a bit of boilerplate, it's common to use link:https://projectlombok.org/[Project Lombok] to code generate these methods at compile time (using Java's annotation processor) simply by adding the `@lombok.Getter` and `@lombok.Setter` annotations to the field.
-The xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp] archetypes use this approach.
+The link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes use this approach.
 
 
 == Value vs Reference Types
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index d4f78f0..28f02fb 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -100,11 +100,12 @@
           <ul>
             <li><a href="toc/about.html">Table of Contents</a></li>
             <li><hr/></li>
-            <li><a href="toc/quick-start.html">Quick Start</a></li>
-            <li><a href="toc/guides.html">Guides</a></li>
-            <li><a href="toc/components.html">Components</a></li>
-            <li><a href="toc/extensions.html">Extensions</a></li>
-            <li><a href="toc/support.html">Support</a></li>
+            <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/extension-catalog.html">Extension Catalog</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>
         </li>
         <li class="menu-has-children">
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
index 4867aa4..ff6a145 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
@@ -255,7 +255,7 @@ In other words these describe how the application chooses to configure the frame
 +
 The classic example here is the JDBC URL.
 
-For example, the xref:starters:simpleapp:about.adoc[SimpleApp archetype]'s `AppManifest` is defined as:
+For example, the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]'s `AppManifest` is defined as:
 
 [source,java]
 ----
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java b/core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
index 26640d2..8072669 100644
--- a/core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
+++ b/core/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
@@ -24,8 +24,9 @@ import javax.ws.rs.core.MediaType;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
-// tag::refguide[]
 public interface AcceptHeaderService {
-    List<MediaType> getAcceptableMediaTypes();  // <1>
+
+    @Programmatic
+    List<MediaType> getAcceptableMediaTypes();
+
 }
-// end::refguide[]
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java b/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
index 477fa03..c1e116a 100644
--- a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
+++ b/core/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
@@ -37,7 +37,6 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
  * {@link org.apache.isis.applib.annotation.DomainService}.  This means that it is automatically registered and
  * available for use; no further configuration is required.
  */
-// tag::refguide[]
 @Service
 @Named("isisApplib.CommandContext")
 @RequestScoped
@@ -57,4 +56,3 @@ public class CommandContext {
     }
 
 }
-// end::refguide[]
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java b/core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
index 080e91e..3fc3f80 100644
--- a/core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
+++ b/core/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
@@ -26,8 +26,12 @@ import org.apache.isis.applib.services.command.Command;
 public interface CommandService {
 
     /**
-     * Simply instantiate the appropriate instance of the {@link Command}.  Its members will be populated automatically
-     * by the framework (the {@link Command}'s {@link Command#getTimestamp()}, {@link Command#getUser()} and {@link Command#getUniqueId()}).
+     * Simply instantiate the appropriate instance of the {@link Command}.
+     *
+     * <p>
+     * Its members will be populated automatically by the framework (the {@link Command}'s
+     * {@link Command#getTimestamp()}, {@link Command#getUser()} and {@link Command#getUniqueId()}).
+     * </p>
      */
     Command create();
 
diff --git a/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java b/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
index 99e9444..52687c2 100644
--- a/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
+++ b/core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
@@ -18,6 +18,8 @@
  */
 package org.apache.isis.applib.services.iactn;
 
+import lombok.Getter;
+
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 
@@ -44,15 +46,11 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
 @RequestScoped
 public class InteractionContext {
 
-    private Interaction interaction;
-
     /**
-     * Returns the currently active {@link Interaction} for this thread.
-     * @return
+     * The currently active {@link Interaction} for this thread.
      */
-    public Interaction getInteraction() {
-        return interaction;
-    }
+    @Getter                                 // <1>
+    private Interaction interaction;
 
     /**
      * <b>NOT API</b>: intended to be called only by the framework.
@@ -60,5 +58,4 @@ public class InteractionContext {
     public void setInteraction(final Interaction interaction) {
         this.interaction = interaction;
     }
-
 }
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
index b8874c9..a6964c5 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
@@ -19,11 +19,13 @@ The API defined by the service is:
 
 [source,java]
 ----
-include::example$services/acceptheader/AcceptHeaderService.java[tags=refguide]
+public interface AcceptHeaderService {
+    List<MediaType> getAcceptableMediaTypes();  // <1>
+}
 ----
 <1> returns the list of media types found in the HTTP Accept header.
 
-The default implementation is provided by `o.a.i.v.ro.rendering.service.acceptheader.AcceptHeaderServiceForRest`, and is xref:refguide:applib-ant:RequestScoped.adoc[`@RequestScoped`].
+The default implementation is provided by `o.a.i.v.ro.rendering.service.acceptheader.AcceptHeaderServipceForRest`, and is xref:refguide:applib-ant:RequestScoped.adoc[`@RequestScoped`].
 
 [NOTE]
 ====
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
index 0aca1f0..cdf5b9e 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
@@ -51,7 +51,7 @@ The class is immutable but it has a builder (obtained using `FixturescriptsSpeci
 
 == Implementation
 
-The xref:starters:simpleapp:about.adoc[SimpleApp archetype] has a simple implementation of this service:
+The link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] has a simple implementation of this service:
 
 [source,java]
 ----
diff --git a/core/config/src/main/doc/modules/config/pages/specifying-components.adoc b/core/config/src/main/doc/modules/config/pages/specifying-components.adoc
index 0fbd4e0..11dc0b7 100644
--- a/core/config/src/main/doc/modules/config/pages/specifying-components.adoc
+++ b/core/config/src/main/doc/modules/config/pages/specifying-components.adoc
@@ -29,7 +29,7 @@ To specify the `AppManifest` as a configuration property, use:
 |`o.a.i.applib.AppManifest` +
 
 By convention this implementation resides in an `myapp-app` Maven module (as opposed to `myapp-dom` or `myapp-fixture`).
-See the xref:starters:simpleapp:about.adoc[SimpleApp archetype] for details.
+See the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] for details.
 
 |===
 
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
index a0b16ee..7986c6c 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
@@ -1,4 +1 @@
-* xref:configuring.adoc[Configuring]
-* xref:jdo-mappings.adoc[JDO Mappings]
-* xref:db-schemas.adoc[DB Schemas]
-* xref:hints-and-tips.adoc[Hints-n-Tips]
+include::pjdo:ROOT:partial$component-nav.adoc[]
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
index 52892bf..e5228e5 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
@@ -27,7 +27,7 @@ We therefore recommend that you disable persistence-by-reachability by adding th
 isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
 ----
 
-This change has been made to both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp] archetypes.
+This change has been made to both the link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes.
 
 If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the `RepositoryService#persist(.)` or `RepositoryService#persistAndFlush(.)` methods.
 
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
index c345764..ca3bd04 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
@@ -9,7 +9,7 @@ DataNucleus will for itself also and read the `META-INF/persistence.xml`.
 In theory it can hold mappings and even connection strings.
 However, with Apache Isis we tend to use annotations instead and externalize connection strings. so its definition is extremely simply, specifying just the name of the "persistence unit".
 
-Here's the one provided by the xref:starters:simpleapp:about.adoc[SimpleApp archetype]:
+Here's the one provided by the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]:
 
 [source,xml]
 ----
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
new file mode 100644
index 0000000..992cf9c
--- /dev/null
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,2 @@
+include::pjdo:ROOT:partial$module-nav.adoc[]
+include::pjdo:flywayjdo:partial$module-nav.adoc[]
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
copy from core/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
copy to core/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc b/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
index 06a3fd3..140e752 100644
--- a/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
+++ b/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
@@ -10,7 +10,7 @@ The Shiro security mechanism is an integration wih Apache Shiro that implements
 
 [TIP]
 ====
-Both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp] archetypes are pre-configured to use Apache Shiro, so much of what follows may well have been set up already.
+Both the link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes are pre-configured to use Apache Shiro, so much of what follows may well have been set up already.
 ====
 
 
@@ -18,7 +18,7 @@ Both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpl
 
 To tell Apache Isis to use Shiro when using an xref:refguide:applib-cm:rgcms.adoc#__rgcms_classes_AppManifest-bootstrapping_bootstrapping_AppManifestAbstract[`AppManifestAbstract.BUILDER`], simply specify the "authMechanism" as "shiro".
 
-For example, the xref:starters:helloworld:about.adoc[HelloWorld archetype] bootstraps using:
+For example, the link:https://github.com/apache/isis-app-helloworld[HelloWorld archetype] bootstraps using:
 
 [source,java]
 ----
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc b/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
index 303322c..90aecec 100644
--- a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
+++ b/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
@@ -11,7 +11,7 @@ Probably the simplest realm to use is Shiro's built-in `IniRealm`, which reads f
 
 This is suitable for prototyping, but isn't intended for production use, if only because user/password credentials are stored in plain text.
 Nevertheless, it's a good starting point.
-The app generated by both the xref:starters:helloworld:about.adoc[HelloWorld] and xref:starters:simpleapp:about.adoc[SimpleApp]  archetypes are configured to use this realm.
+The app generated by both the link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:https://github.com/apache/isis-app-simpleapp[SimpleApp]  archetypes are configured to use this realm.
 
 The diagram below shows the Isis and components involved:
 
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc b/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
index 487f426..b77e4e2 100644
--- a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
+++ b/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
@@ -10,7 +10,7 @@ Because (depending on the size of your app) it takes a little time to bootstrap
 
 The recommended way to bootstrapping of integration tests is done using a xref:refguide:applib-cm:classes/AppManifest2-bootstrapping.adoc[`Module`] implementation, along with the `IntegrationTestAbstract3` superclass.
 
-For example, the xref:starters:simpleapp:about.adoc[SimpleApp archetype]'s integration tests all inherit from this class:
+For example, the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]'s integration tests all inherit from this class:
 
 [source,java]
 ----
diff --git a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc b/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
index aed5ec7..d69b097 100644
--- a/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
+++ b/core/testsupport/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
@@ -4,7 +4,7 @@
 include::_attributes.adoc[]
 
 
-Apache Isis' integration test support is automatically configured if you use the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+Apache Isis' integration test support is automatically configured if you use the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 To set it up manually, update the `pom.xml` of your domain object model module:
 
 [source,xml]
@@ -21,7 +21,7 @@ To set it up manually, update the `pom.xml` of your domain object model module:
 
 [NOTE]
 ====
-This can also be done by adding a dependency to `org.apache.isis.mavendeps:isis-mavendeps-testing` module; see the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+This can also be done by adding a dependency to `org.apache.isis.mavendeps:isis-mavendeps-testing` module; see the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 ====
 
 We also recommend that you configure the `maven-surefire-plugin` to pick up the following class patterns:
@@ -52,5 +52,5 @@ We also recommend that you configure the `maven-surefire-plugin` to pick up the
 
 [NOTE]
 ====
-This can also be done using mavenmixins; see the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+This can also be done using mavenmixins; see the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 ====
diff --git a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc b/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
index 4271edd..22b25a7 100644
--- a/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
+++ b/core/testsupport/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
@@ -4,7 +4,7 @@
 include::_attributes.adoc[]
 
 
-Apache Isis' unit test support is automatically configured if you use the xref:starters:helloworld:about.adoc[HelloWorld] or the xref:starters:simpleapp:about.adoc[SimpleApp] archetypes.
+Apache Isis' unit test support is automatically configured if you use the link:https://github.com/apache/isis-app-helloworld[HelloWorld] or the link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes.
 To set it up manually, update the `pom.xml` of your domain object model module:
 
 [source,xml]
@@ -20,7 +20,7 @@ To set it up manually, update the `pom.xml` of your domain object model module:
 
 [NOTE]
 ====
-This can also be done by adding a dependency to `org.apache.isis.mavendeps:isis-mavendeps-testing` module; see the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+This can also be done by adding a dependency to `org.apache.isis.mavendeps:isis-mavendeps-testing` module; see the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 ====
 
 
@@ -52,5 +52,5 @@ We also recommend that you configure the `maven-surefire-plugin` to pick up the
 
 [NOTE]
 ====
-This can also be done using mavenmixins; see the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+This can also be done using mavenmixins; see the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 ====
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
index 01b51f6..22c3398 100644
--- a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
+++ b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
@@ -13,7 +13,7 @@ This chapter provides details of these resources, the link ``Rel``s to access th
 
 The xref:refguide:applib-svc:presentation-layer-spi/MenuBarsService.adoc[`MenuBarsService`] provides the `menu.layout.xml` XML document which defines how to group the various domain service actions into menubars, menus and menu sections.
 
-For example, the xref:starters:helloworld:about.adoc[Hello World starter app] has the following layout:
+For example, the link:https://github.com/apache/isis-app-helloworld[Hello World starter app] has the following layout:
 
 [source,xml]
 ----
@@ -135,7 +135,7 @@ Note that because of dynamic icons (the xref:refguide:applib-cm:methods.adoc#ico
 The xref:refguide:applib-svc:presentation-layer-spi/GridService.adoc[`GridService`] provides an XML document which defines the layout of any of domain object.
 Typically this is the contents of the `Xxx.layout.xml` file (where `Xxx` is the domain type).
 
-For example, in the xref:starters:helloworld:about.adoc[Hello World starter app] the `HelloWorld` domain object has a layout defined by `HelloWorld.layout.xml`.
+For example, in the link:https://github.com/apache/isis-app-helloworld[Hello World starter app] the `HelloWorld` domain object has a layout defined by `HelloWorld.layout.xml`.
 
 The representation returned by the domain object resource (section 14.4 of the RO spec v1.0) has been extended to provide a link to this resource:
 
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
index 301f4ad..ec641ca 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
@@ -459,7 +459,7 @@ Ensure the following is defined in the dom project's `pom.xml`:
 </resources>
 ----
 
-If using an Apache Isis xref:starters:helloworld:about.adoc[HelloWorld] xref:starters:simpleapp:about.adoc[SimpleApp] archetypes, then the POM is already correctly configured.
+If using an Apache Isis link:https://github.com/apache/isis-app-helloworld[HelloWorld] link:https://github.com/apache/isis-app-simpleapp[SimpleApp] archetypes, then the POM is already correctly configured.
 
 
 
diff --git a/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
index 35e1cca..c74df47 100644
--- a/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
+++ b/extensions/core/spring/src/main/doc/modules/spring/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:extensions:spring:about.adoc[Spring (extension)]
+* xref:extensions:spring:about.adoc[Spring]
 
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml b/extensions/lib/base/impl/src/main/doc/antora.yml
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
copy to extensions/lib/base/impl/src/main/doc/antora.yml
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/lib/base/impl/src/main/doc/modules/base/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/lib/base/impl/src/main/doc/modules/base/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc b/extensions/lib/base/impl/src/main/doc/modules/base/nav.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
copy to extensions/lib/base/impl/src/main/doc/modules/base/nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/lib/base/impl/src/main/doc/modules/base/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/lib/base/impl/src/main/doc/modules/base/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/lib/base/impl/src/main/doc/modules/base/pages/about.adoc
similarity index 98%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/lib/base/impl/src/main/doc/modules/base/pages/about.adoc
index 883c317..9eb066b 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/lib/base/impl/src/main/doc/modules/base/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= Base Library
 :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[]
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc b/extensions/lib/base/impl/src/main/doc/modules/base/partials/_attributes.adoc
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
rename to extensions/lib/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/extensions/lib/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
new file mode 100644
index 0000000..d97c5d9
--- /dev/null
+++ b/extensions/lib/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:docx:about.adoc[Base Library]
+
+
diff --git a/extensions/persistence/h2console/pom.xml b/extensions/lib/docx/impl/pom.xml
similarity index 70%
copy from extensions/persistence/h2console/pom.xml
copy to extensions/lib/docx/impl/pom.xml
index 13e3cff..e28c5ad 100644
--- a/extensions/persistence/h2console/pom.xml
+++ b/extensions/lib/docx/impl/pom.xml
@@ -21,27 +21,17 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-h2console-dom</artifactId>
-	<name>Apache Isis Ext - H2 Console</name>
-	<description>Menu and configuration to open up H2 Console</description>
+	<artifactId>isis-extensions-flywayjdo-dom</artifactId>
+	<name>Apache Isis Ext - FlywayJDO</name>
+	<description>Integrates FlywayDB when using JDO Object Store</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.h2console.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/h2console/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.extensions.flywayjdo.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/extensions/flywayjdo/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-webapp</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/extensions/persistence/h2console/src/main/doc/antora.yml b/extensions/lib/docx/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/antora.yml
rename to extensions/lib/docx/impl/src/main/doc/antora.yml
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/_attributes.adoc b/extensions/lib/docx/impl/src/main/doc/modules/docx/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/h2console/_attributes.adoc
rename to extensions/lib/docx/impl/src/main/doc/modules/docx/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc b/extensions/lib/docx/impl/src/main/doc/modules/docx/nav.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
copy to extensions/lib/docx/impl/src/main/doc/modules/docx/nav.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/_attributes.adoc b/extensions/lib/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/h2console/partials/_attributes.adoc
rename to extensions/lib/docx/impl/src/main/doc/modules/docx/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/lib/docx/impl/src/main/doc/modules/docx/pages/about.adoc
similarity index 98%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/lib/docx/impl/src/main/doc/modules/docx/pages/about.adoc
index 883c317..f09dc2a 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/lib/docx/impl/src/main/doc/modules/docx/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= Docx Library
 :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[]
 
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/_attributes.adoc b/extensions/lib/docx/impl/src/main/doc/modules/docx/partials/_attributes.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/_attributes.adoc
rename to extensions/lib/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/extensions/lib/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
new file mode 100644
index 0000000..e10d7c0
--- /dev/null
+++ b/extensions/lib/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:docx:about.adoc[Docx Library]
+
+
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
similarity index 89%
copy from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
copy to extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
index 352e3e9..a654ca4 100644
--- a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/extensions/lib/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.hsqldbmgr.dom;
+package org.apache.isis.extensions.docx.dom;
 
 import org.apache.isis.webapp.IsisModuleWebapp;
 import org.springframework.context.annotation.ComponentScan;
@@ -24,10 +24,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Import({
-        IsisModuleWebapp.class
-})
 @ComponentScan
-public class IsisModuleExtHsqldbMgr {
+public class IsisModuleExtDocx {
 
 }
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml b/extensions/lib/excel/impl/src/main/doc/antora.yml
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
copy to extensions/lib/excel/impl/src/main/doc/antora.yml
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/lib/excel/impl/src/main/doc/modules/excel/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/lib/excel/impl/src/main/doc/modules/excel/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc b/extensions/lib/excel/impl/src/main/doc/modules/excel/nav.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
copy to extensions/lib/excel/impl/src/main/doc/modules/excel/nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/lib/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/lib/excel/impl/src/main/doc/modules/excel/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/lib/excel/impl/src/main/doc/modules/excel/pages/about.adoc
similarity index 98%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/lib/excel/impl/src/main/doc/modules/excel/pages/about.adoc
index 883c317..93d45fb 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/lib/excel/impl/src/main/doc/modules/excel/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= Excel Library
 :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[]
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/lib/excel/impl/src/main/doc/modules/excel/partials/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/lib/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/extensions/lib/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
new file mode 100644
index 0000000..2958aaa
--- /dev/null
+++ b/extensions/lib/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:excel:about.adoc[Excel Library]
+
+
diff --git a/extensions/persistence/h2console/pom.xml b/extensions/persistence/flywayjdo/impl/pom.xml
similarity index 68%
copy from extensions/persistence/h2console/pom.xml
copy to extensions/persistence/flywayjdo/impl/pom.xml
index 13e3cff..10e4870 100644
--- a/extensions/persistence/h2console/pom.xml
+++ b/extensions/persistence/flywayjdo/impl/pom.xml
@@ -18,30 +18,20 @@
 		<groupId>org.apache.isis.extensions</groupId>
 		<artifactId>isis-extensions</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
-	<artifactId>isis-extensions-h2console-dom</artifactId>
-	<name>Apache Isis Ext - H2 Console</name>
-	<description>Menu and configuration to open up H2 Console</description>
+	<artifactId>isis-extensions-flywayjdo-dom</artifactId>
+	<name>Apache Isis Ext - FlywayJDO</name>
+	<description>Integrates FlywayDB when using JDO Object Store</description>
 
 	<properties>
-		<jar-plugin.automaticModuleName>org.apache.isis.extensions.h2console.dom</jar-plugin.automaticModuleName>
-		<git-plugin.propertiesDir>org/apache/isis/extensions/h2console/dom</git-plugin.propertiesDir>
+		<jar-plugin.automaticModuleName>org.apache.isis.extensions.flywayjdo.dom</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/extensions/flywayjdo/dom</git-plugin.propertiesDir>
 	</properties>
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>isis-webapp</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-		</dependency>
-
 	</dependencies>
 
 </project>
diff --git a/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml b/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml
new file mode 100644
index 0000000..e805b25
--- /dev/null
+++ b/extensions/persistence/flywayjdo/impl/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: pjdo
+version: master
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/nav.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
copy to extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/pages/about.adoc
similarity index 97%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/pages/about.adoc
index 883c317..33f8538 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= Flyway for JDO
 :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[]
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/_attributes.adoc
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
new file mode 100644
index 0000000..e255168
--- /dev/null
+++ b/extensions/persistence/flywayjdo/impl/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:pjdo:flywayjdo:about.adoc[Flyway for JDO]
+
+
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
similarity index 89%
copy from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
copy to extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
index 352e3e9..09412b7 100644
--- a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/extensions/persistence/flywayjdo/impl/src/main/java/org/apache/isis/extensions/flywayjdo/dom/IsisModuleExtFlywayJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.hsqldbmgr.dom;
+package org.apache.isis.extensions.flywayjdo.dom;
 
 import org.apache.isis.webapp.IsisModuleWebapp;
 import org.springframework.context.annotation.ComponentScan;
@@ -24,10 +24,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Import({
-        IsisModuleWebapp.class
-})
 @ComponentScan
-public class IsisModuleExtHsqldbMgr {
+public class IsisModuleExtFlywayJdo {
 
 }
diff --git a/extensions/persistence/h2console/pom.xml b/extensions/persistence/h2console/impl/pom.xml
similarity index 97%
rename from extensions/persistence/h2console/pom.xml
rename to extensions/persistence/h2console/impl/pom.xml
index 13e3cff..40dc77e 100644
--- a/extensions/persistence/h2console/pom.xml
+++ b/extensions/persistence/h2console/impl/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.extensions</groupId>
 		<artifactId>isis-extensions</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-extensions-h2console-dom</artifactId>
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml b/extensions/persistence/h2console/impl/src/main/doc/antora.yml
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
copy to extensions/persistence/h2console/impl/src/main/doc/antora.yml
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/persistence/h2console/impl/src/main/doc/modules/h2console/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/nav.adoc
similarity index 100%
rename from extensions/persistence/h2console/src/main/doc/modules/h2console/nav.adoc
rename to extensions/persistence/h2console/impl/src/main/doc/modules/h2console/nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/h2console/impl/src/main/doc/modules/h2console/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/pages/about.adoc
similarity index 100%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/persistence/h2console/impl/src/main/doc/modules/h2console/pages/about.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/_attributes.adoc
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
new file mode 100644
index 0000000..02826d6
--- /dev/null
+++ b/extensions/persistence/h2console/impl/src/main/doc/modules/h2console/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:h2console:about.adoc[H2 Console]
+
+
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/IsisModuleExtH2Console.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/IsisModuleExtH2Console.java
similarity index 100%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/IsisModuleExtH2Console.java
rename to extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/IsisModuleExtH2Console.java
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
similarity index 100%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
rename to extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java b/extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
similarity index 100%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
rename to extensions/persistence/h2console/impl/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc b/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc
deleted file mode 100644
index 35e1cca..0000000
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:extensions:spring:about.adoc[Spring (extension)]
-
-
diff --git a/extensions/persistence/hsqldbmgr/pom.xml b/extensions/persistence/hsqldbmgr/impl/pom.xml
similarity index 97%
rename from extensions/persistence/hsqldbmgr/pom.xml
rename to extensions/persistence/hsqldbmgr/impl/pom.xml
index 3ec20eb..da9e957 100644
--- a/extensions/persistence/hsqldbmgr/pom.xml
+++ b/extensions/persistence/hsqldbmgr/impl/pom.xml
@@ -18,7 +18,7 @@
 		<groupId>org.apache.isis.extensions</groupId>
 		<artifactId>isis-extensions</artifactId>
 		<version>2.0.0-M3-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>isis-extensions-hsqldbmgr-dom</artifactId>
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/antora.yml b/extensions/persistence/hsqldbmgr/impl/src/main/doc/antora.yml
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/antora.yml
rename to extensions/persistence/hsqldbmgr/impl/src/main/doc/antora.yml
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/_attributes.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/nav.adoc
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc
rename to extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/nav.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/pages/_attributes.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/pages/about.adoc
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc
rename to extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/pages/about.adoc
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
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
new file mode 100644
index 0000000..847ab33
--- /dev/null
+++ b/extensions/persistence/hsqldbmgr/impl/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:extensions:hsqldbmgr:about.adoc[HSQLDB Manager]
+
+
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
rename to extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
rename to extensions/persistence/hsqldbmgr/impl/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc b/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
deleted file mode 100644
index 35e1cca..0000000
--- a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:extensions:spring:about.adoc[Spring (extension)]
-
-
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b9fe027..b8b1da7 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -201,30 +201,34 @@
 
 	<modules>
 		<module>core/spring</module>
-		<module>persistence/h2console</module>
-		<module>persistence/hsqldbmgr</module>
+		<module>lib/base/impl</module>
+<!--
+		<module>lib/excel/fixture</module>
+		<module>lib/excel/integtests</module>
+-->
+		<module>lib/excel/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/restclient</module>
 		<module>vw/asciidoc</module>
 		<module>vw/exceldownload</module>
 		<module>vw/markdown</module>
 		<module>vw/sse</module>
 
-		<module>lib/base/impl</module>
-<!--
-		<module>lib/excel/fixture</module>
-		<module>lib/excel/integtests</module>
--->
-		<module>lib/excel/impl</module>
-		<module>lib/fakedata/impl</module>
-		<module>lib/fakedata/fixture</module>
-<!--
-		<module>lib/fakedata/integtests</module>
--->
-		<module>lib/unittestsupport/impl</module>
 	</modules>
 
 	<profiles>
diff --git a/extensions/lib/fakedata/fixture/.gitignore b/extensions/testing/fakedata/fixture/.gitignore
similarity index 100%
rename from extensions/lib/fakedata/fixture/.gitignore
rename to extensions/testing/fakedata/fixture/.gitignore
diff --git a/extensions/lib/fakedata/fixture/logging-dn-enhance.properties b/extensions/testing/fakedata/fixture/logging-dn-enhance.properties
similarity index 100%
rename from extensions/lib/fakedata/fixture/logging-dn-enhance.properties
rename to extensions/testing/fakedata/fixture/logging-dn-enhance.properties
diff --git a/extensions/lib/fakedata/fixture/pom.xml b/extensions/testing/fakedata/fixture/pom.xml
similarity index 100%
rename from extensions/lib/fakedata/fixture/pom.xml
rename to extensions/testing/fakedata/fixture/pom.xml
diff --git a/extensions/lib/fakedata/fixture/src/main/java/META-INF/persistence.xml b/extensions/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/META-INF/persistence.xml
rename to extensions/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java b/extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
similarity index 100%
rename from extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/extensions/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/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/extensions/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/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
rename to extensions/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
diff --git a/extensions/lib/fakedata/impl/pom.xml b/extensions/testing/fakedata/impl/pom.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/pom.xml
rename to extensions/testing/fakedata/impl/pom.xml
diff --git a/extensions/testing/fakedata/impl/src/main/doc/antora.yml b/extensions/testing/fakedata/impl/src/main/doc/antora.yml
new file mode 100644
index 0000000..0d34b75
--- /dev/null
+++ b/extensions/testing/fakedata/impl/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: testing
+version: master
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
copy to extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/_attributes.adoc
diff --git a/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
similarity index 98%
copy from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
copy to extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
index 883c317..9be2d0d 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
@@ -1,4 +1,4 @@
-= H2 Console
+= Fakedata
 :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[]
 
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/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/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
new file mode 100644
index 0000000..cf7bdbf
--- /dev/null
+++ b/extensions/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:fakedata:about.adoc[Fakedata (extension)]
+
+
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf b/extensions/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/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf b/extensions/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/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc b/extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
rename to extensions/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
diff --git a/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java b/extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
similarity index 100%
rename from extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
rename to extensions/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
diff --git a/extensions/lib/fakedata/integtests/log4j2-test.xml b/extensions/testing/fakedata/integtests/log4j2-test.xml
similarity index 100%
rename from extensions/lib/fakedata/integtests/log4j2-test.xml
rename to extensions/testing/fakedata/integtests/log4j2-test.xml
diff --git a/extensions/lib/fakedata/integtests/pom.xml b/extensions/testing/fakedata/integtests/pom.xml
similarity index 100%
rename from extensions/lib/fakedata/integtests/pom.xml
rename to extensions/testing/fakedata/integtests/pom.xml
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
similarity index 100%
rename from extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
rename to extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
similarity index 100%
rename from extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
rename to extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java b/extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
similarity index 100%
rename from extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
rename to extensions/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
diff --git a/extensions/lib/fakedata/integtests/toDoItems-actual.xlsx b/extensions/testing/fakedata/integtests/toDoItems-actual.xlsx
similarity index 100%
rename from extensions/lib/fakedata/integtests/toDoItems-actual.xlsx
rename to extensions/testing/fakedata/integtests/toDoItems-actual.xlsx
diff --git a/extensions/lib/fakedata/integtests/translations.pot b/extensions/testing/fakedata/integtests/translations.pot
similarity index 100%
rename from extensions/lib/fakedata/integtests/translations.pot
rename to extensions/testing/fakedata/integtests/translations.pot
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
index 6efda1f..e9f5227 100644
--- a/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
+++ b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
@@ -20,7 +20,7 @@ This is annotated to be rendered on the secondary "Prototyping" menu.
 
 The behaviour of this domain menu service can be refined by providing an implementation of the optional xref:refguide:applib-svc:testing/FixtureScriptsSpecificationProvider.adoc[`FixtureScriptsSpecificationProvider`] SPI.
 
-For example, here's the `FixtureScriptsSpecificationProvider` service that's generated by the xref:starters:simpleapp:about.adoc[SimpleApp archetype]:
+For example, here's the `FixtureScriptsSpecificationProvider` service that's generated by the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]:
 
 [source,java]
 ----
@@ -71,7 +71,7 @@ If you had defined many fixture scripts then a drop-down might become unwieldy,
 
 ----
 
-You are free, of course, to add additional "convenience" actions into it if you wish for the most commonly used/demo'd setups ; you'll find that the xref:starters:simpleapp:about.adoc[SimpleApp archetype] adds this additional action:
+You are free, of course, to add additional "convenience" actions into it if you wish for the most commonly used/demo'd setups ; you'll find that the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] adds this additional action:
 
 [source,java]
 ----
@@ -100,7 +100,7 @@ However, we strongly recommend that you use it to invoke actions on business obj
 That way, the fixture script will remain valid even if the underlying implementation of the system changes in the future.
 
 For example, here's a fixture script called `RecreateSimpleObjects`.
-(This used to be part of the xref:starters:simpleapp:about.adoc[SimpleApp archetype], though the archetype now ships with a more sophisticated design, discussed below):
+(This used to be part of the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype], though the archetype now ships with a more sophisticated design, discussed below):
 
 [source,java]
 ----
@@ -169,7 +169,7 @@ So, in this case, when the fixture script is executed we actually get 6 objects
 
 Fixture scripts can be called from integration tests just the same way that fixture scripts can call one another.
 
-For example, here's an integration test from the xref:starters:simpleapp:about.adoc[SimpleApp archetype]:
+For example, here's an integration test from the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]:
 
 [source,java]
 ----
@@ -251,7 +251,7 @@ public interface PersonaWithFinder<T> {
 }
 ----
 
-The xref:starters:simpleapp:about.adoc[SimpleApp archetype] provides a sample implementation of these interfaces:
+The link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] provides a sample implementation of these interfaces:
 
 [source,java]
 ----
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
index 589a2af..a6f327c 100644
--- a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
+++ b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
 
 
 
-Apache Isis' BDD spec support is automatically configured if you use the xref:starters:simpleapp:about.adoc[SimpleApp archetype].
+Apache Isis' BDD spec support is automatically configured if you use the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype].
 To set it up manually, update the `pom.xml` of your domain object model module:
 
 [source,xml]
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
index c62bf61..5e10909 100644
--- a/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
+++ b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
@@ -26,7 +26,7 @@ The `glue` attribute of the Cucumber-JVM JUnit runner allows you to indicate whi
 There also needs to be one glue class that is used to bootstrap the runtime.
 
 
-Here's an example of a feature from the xref:starters:simpleapp:about.adoc[SimpleApp archetype]:
+Here's an example of a feature from the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype]:
 
 [source,java]
 ----
@@ -69,7 +69,7 @@ public class RunBddSpecs {
 ----
 
 The JSON formatter allows integration with enhanced reports.
-(Commented out) configuration for this is provided in the xref:starters:simpleapp:about.adoc[SimpleApp archetype].
+(Commented out) configuration for this is provided in the link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype].
 
 The bootstrapping of Apache Isis itself lives in a `BootstrappingGlue` step definition:
 
diff --git a/extensions/lib/unittestsupport/impl/pom.xml b/extensions/testing/unittestsupport/impl/pom.xml
similarity index 100%
rename from extensions/lib/unittestsupport/impl/pom.xml
rename to extensions/testing/unittestsupport/impl/pom.xml
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/antora.yml b/extensions/testing/unittestsupport/impl/src/main/doc/antora.yml
new file mode 100644
index 0000000..0d34b75
--- /dev/null
+++ b/extensions/testing/unittestsupport/impl/src/main/doc/antora.yml
@@ -0,0 +1,2 @@
+name: testing
+version: master
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/_attributes.adoc
rename to extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/_attributes.adoc
diff --git a/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc
similarity index 100%
copy from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
copy to extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/_attributes.adoc
diff --git a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
similarity index 95%
rename from extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
rename to extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
index 883c317..2ebe888 100644
--- a/extensions/persistence/h2console/src/main/doc/modules/h2console/pages/about.adoc
+++ b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
@@ -1,6 +1,5 @@
-= H2 Console
+= Unit Test Support (extension)
 :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[]
 
-TODO
-
+TODO
\ No newline at end of file
diff --git a/extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/_attributes.adoc
similarity index 100%
rename from extensions/persistence/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/_attributes.adoc
rename to extensions/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/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
new file mode 100644
index 0000000..1c0f3d4
--- /dev/null
+++ b/extensions/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:unit-test-support-ext:about.adoc[Unit Test Support (extension)]
+
+
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
diff --git a/extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java b/extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
rename to extensions/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
diff --git a/extensions/lib/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java b/extensions/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
similarity index 100%
rename from extensions/lib/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
rename to extensions/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
index 6613bbf..1833e8f 100644
--- a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
+++ b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
@@ -36,7 +36,7 @@ As noted in the introduction, all the goals require an xref:refguide:applib-cm:c
 This can be extremely minimal; it isn't necessary to use the main `AppManifest` (in the `app` module) used to bootstrap the application, you can instead use a cut-down one.
 This then allows the plugins to be run during the build of the `dom` module, rather than having to run in the context of the `integtest` module.
 
-For example, the xref:starters:simpleapp:about.adoc[SimpleApp]'s
+For example, the link:https://github.com/apache/isis-app-simpleapp[SimpleApp]'s
 manifest is:
 
 [source,java]
@@ -82,6 +82,6 @@ We recommend the following:
 
 * run the `xsd` plugin in a new `xsd` submodule; contributed actions are irrelevant for this particular goal; having a separate submodule allows the configuration of both the `xsd` goal (to generate the XSD schemas) and any other XSD-related configuration to be kept in a single place.
 
-The xref:starters:simpleapp:about.adoc[SimpleApp archetype] reflects these recommendations for the `validate` and `swagger` goals.
+The link:https://github.com/apache/isis-app-simpleapp[SimpleApp archetype] reflects these recommendations for the `validate` and `swagger` goals.
 You can find an example of the `xsd` plugin in the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] application.
 
diff --git a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
index 8b29174..50110d1 100644
--- a/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
+++ b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
@@ -106,7 +106,7 @@ mvn test -Dskip.isis-validate
 
 == Example of failure
 
-In the xref:starters:simpleapp:about.adoc[SimpleApp] application the `SimpleObject` defines an `updateName` action.
+In the link:https://github.com/apache/isis-app-simpleapp[SimpleApp] application the `SimpleObject` defines an `updateName` action.
 This has a supporting method:
 
 
diff --git a/site.yml b/site.yml
index 1f8564a..5b69ecf 100644
--- a/site.yml
+++ b/site.yml
@@ -140,11 +140,25 @@ content:
     - url: .
       start_path: extensions/core/spring/src/main/doc # extensions
       branches: HEAD
+
+    - url: .
+      start_path: extensions/lib/base/impl/src/main/doc # extensions
+      branches: HEAD
+    - url: .
+      start_path: extensions/lib/docx/impl/src/main/doc # extensions
+      branches: HEAD
+    - url: .
+      start_path: extensions/lib/excel/impl/src/main/doc # extensions
+      branches: HEAD
+
     - url: .
-      start_path: extensions/persistence/h2console/src/main/doc # extensions
+      start_path: extensions/persistence/flywayjdo/impl/src/main/doc # extensions
       branches: HEAD
     - url: .
-      start_path: extensions/persistence/hsqldbmgr/src/main/doc # extensions
+      start_path: extensions/persistence/h2console/impl/src/main/doc # extensions
+      branches: HEAD
+    - url: .
+      start_path: extensions/persistence/hsqldbmgr/impl/src/main/doc # extensions
       branches: HEAD
 
     - url: .
@@ -168,6 +182,10 @@ content:
     - url: .
       start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
       branches: HEAD
+
+    - url: .
+      start_path: extensions/testing/fakedata/impl/src/main/doc # testing
+      branches: HEAD
     - url: .
       start_path: extensions/testing/fixtures/src/main/doc # testing
       branches: HEAD
@@ -175,6 +193,10 @@ content:
       start_path: extensions/testing/specsupport/src/main/doc # testing
       branches: HEAD
     - url: .
+      start_path: extensions/testing/unittestsupport/impl/src/main/doc # testing
+      branches: HEAD
+
+    - url: .
       start_path: extensions/vro/restclient/src/main/doc # vro
       branches: HEAD
     - url: .
diff --git a/starters/src/main/doc/modules/helloworld/pages/about.adoc b/starters/src/main/doc/modules/helloworld/pages/about.adoc
index 046ba52..75cf25e 100644
--- a/starters/src/main/doc/modules/helloworld/pages/about.adoc
+++ b/starters/src/main/doc/modules/helloworld/pages/about.adoc
@@ -10,7 +10,7 @@ Both the business logic and supporting bootstrapping classes are in a single Mav
 [TIP]
 ====
 We don't recommend that you use the helloworld archetype as the basis for your own applications.
-Instead, use the xref:starters:simpleapp:about.adoc[SimpleApp starter app].
+Instead, use the link:https://github.com/apache/isis-app-simpleapp[SimpleApp starter app].
 This also creates a minimal application, but provides more structure and example tests, useful as you build out your own app.
 ====
 
@@ -526,7 +526,7 @@ If you run into issues, please don't hesitate to ask for help on the link:http:/
 
 When you are ready to start working on your own app, we _don't_ recommend building on top of the helloworld app.
 
-Instead, we suggest that you start with the xref:starters:simpleapp:about.adoc[simpleapp archetype] instead.
+Instead, we suggest that you start with the link:https://github.com/apache/isis-app-simpleapp[simpleapp archetype] instead.
 Although a little more complex, it provides more structure and tests, all of which will help you as your application grows.
 
 
diff --git a/starters/src/main/doc/modules/simpleapp/pages/about.adoc b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
index 145d496..9f0cc2f 100644
--- a/starters/src/main/doc/modules/simpleapp/pages/about.adoc
+++ b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
 NOTE: these notes are out-of-date and need to be reviewed.
 
 The quickest way to get started building an application "for real" is to run the `simpleapp` archetype.
-Like the xref:starters:helloworld:about.adoc[helloworld starter app], this too will generate a very simple one-class domain model (an entity called `SimpleObject` with a couple of properties).
+Like the link:https://github.com/apache/isis-app-helloworld[helloworld starter app], this too will generate a very simple one-class domain model (an entity called `SimpleObject` with a couple of properties).
 
 However, the generated application also provides more structure to assist you as your application grows.
 
@@ -686,10 +686,10 @@ The archetype provides
 
 == Using the App
 
-The generated application is almost identical similar to that generated by xref:starters:helloworld:about.adoc[helloworld starter app]; a description of how to use it can be found xref:starters:helloworld:about.adoc#using-the-app[here].
+The generated application is almost identical similar to that generated by link:https://github.com/apache/isis-app-helloworld[helloworld starter app]; a description of how to use it can be found link:https://github.com/apache/isis-app-helloworld#using-the-app[here].
 
 One additional feature that the simpleapp contains over the helloworld app is a home page.
-This shows all domain objects (as installed by fixture scripts, described xref:starters:simpleapp:about.adoc#running-with-fixtures[above]).
+This shows all domain objects (as installed by fixture scripts, described link:https://github.com/apache/isis-app-simpleapp#running-with-fixtures[above]).
 
 image::using-simple-app/030-home-page.png[width="600px",link="{imagesdir}/using-simple-app/030-home-page.png"]