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

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

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

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

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

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

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