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 2021/05/23 13:45:53 UTC

[isis] 02/02: ISIS-2687: updates docs for starter apps

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

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

commit b9ebd497bd69f3fc9525c4caee2854e1135e1732
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 23 14:29:43 2021 +0100

    ISIS-2687: updates docs for starter apps
    
    also parent-pom.  Also adds link to different variants of demo-wicket (jdo and jpa).  Also updates out of date configs, example
---
 .../components/docs/modules/ROOT/pages/about.adoc  |   2 +-
 .../ErrorReportingService_010-implementation.adoc  |   2 +-
 core/adoc/modules/_overview/pages/about.adoc       |  26 +---
 .../adoc/modules/config/pages/sections/Other.adoc  | 103 +-------------
 .../adoc/modules/config/pages/sections/_nav.adoc   |   5 +-
 .../modules/config/pages/sections/datanucleus.adoc |  10 +-
 .../modules/config/pages/sections/resteasy.adoc    |   8 ++
 .../src/main/adoc/modules/demo/pages/about.adoc    |  22 +--
 .../modules/tooling-cli/examples/isis-tooling.yml  | 152 ++++++++++-----------
 .../pages/extending/replacing-page-elements.adoc   |   2 +-
 .../modules/ROOT/pages/features/where-am-i.adoc    |   2 +-
 11 files changed, 119 insertions(+), 215 deletions(-)

diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index 8e1fc1c..95c055d 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -40,7 +40,7 @@ _POMs_
 == Demos
 
 * xref:docs:demo:about.adoc[Demo App]
-(link:https://demo-wicket.isis.incode.work[online])
+(link:https://demo-wicket.jdo.isis.incode.work[jdo], link:https://demo-wicket.jpa.isis.incode.work[jpa])
 * link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (v1.16.2)]
 
 [discrete]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc
index 748e77f..adebd11 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc
@@ -6,4 +6,4 @@
 == Implementation
 
 This is an SPI.
-The framework provides no default implementations, but an example implementation can be found in the demo app; https://demo-wicket.isis.incode.work[].
+The framework provides no default implementations, but an example implementation can be found in the demo app (link:https://demo-wicket.jdo.isis.incode.work[jdo] or link:https://demo-wicket.jpa.isis.incode.work[jpa]).
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 0180a3b..6ab94f8 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -3600,12 +3600,12 @@ skinparam rectangle<<23>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<24>> {
+skinparam rectangle<<13>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<13>> {
+skinparam rectangle<<24>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -3685,12 +3685,12 @@ skinparam rectangle<<20>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -5765,23 +5765,7 @@ Artifact: isis-viewer-vaadin-ui
 Type: jar
 Directory: /incubator/viewers/vaadin/ui
 ----
-|.Components
-****
-o.a.i.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa +
-o.a.i.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler +
-o.a.i.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa +
-o.a.i.incubator.viewer.vaadin.ui.components.blob.BlobFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.clob.ClobFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.markup.MarkupFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.other.FallbackFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.temporal.TemporalFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.text.TextFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.text.uuid.UuidFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.pages.main.UiActionHandlerVaa +
-o.a.i.incubator.viewer.vaadin.ui.pages.main.UiContextVaaDefault +
-****
-
-.Dependencies
+|.Dependencies
 ****
 com.vaadin:vaadin-spring:jar:<managed> +
 commons-fileupload:commons-fileupload:jar:1.4 +
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/Other.adoc b/core/config/src/main/adoc/modules/config/pages/sections/Other.adoc
index a55fbab..0663eae 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/Other.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/Other.adoc
@@ -12,112 +12,13 @@ include::../section-hooks/Other~pre.adoc[]
 |Default
 |Description
 |
-[[isis.as-map]]
-isis.as-map
+[[isis]]
+isis
 
 | 
 | null
 
 
-|
-[[isis.datanucleus.cache.level2.mode]]
-isis.datanucleus.cache.level2.mode
-
-| 
-| The mode of operation of the L2 cache, deciding which entities are cached.
-
-The default (UNSPECIFIED) is the same as DISABLE_SELECTIVE.
-
-Seel also https://www.datanucleus.org/products/accessplatform_5_2/jdo/persistence.html#cache_level2[DataNucleus Cache docs].
-
-NOTE: this config property isn't used by the framework, but is provided as a convenience for IDE autocomplete. @see https://www.datanucleus.org/products/accessplatform_5_2/jdo/persistence.html#cache_level2
-
-
-|
-[[isis.datanucleus.cache.level2.type]]
-isis.datanucleus.cache.level2.type
-
-|  soft
-| Name of the type of Level 2 Cache to use.
-
-Can be used to interface with external caching products. Use "none" to turn off L2 caching; other values include "soft", "weak", "javax.cache".
-
-See also https://www.datanucleus.org/products/accessplatform_5_2/jdo/persistence.html#cache_level2[DataNucleus Cache docs].
-
-NOTE: this config property isn't used by the framework, but is provided as a convenience for IDE autocomplete. @see https://www.datanucleus.org/products/accessplatform_5_2/jdo/persistence.html#cache_level2
-
-
-|
-[[isis.datanucleus.identifier.identifier-case]]
-isis.datanucleus.identifier. +
-identifier-case
-
-| 
-| null
-
-
-|
-[[isis.datanucleus.manage-relationships]]
-isis.datanucleus. +
-manage-relationships
-
-|  true
-| Whether DataNucleus will try to manage bidirectional relations, correcting the input objects so that all relations are consistent.
-
-This process runs when flush()/commit() is called. You can set it to false if you always set both sides of a relation when persisting/updating.
-
-
-|
-[[isis.datanucleus.persistence-by-reachability-at-commit]]
-isis.datanucleus. +
-persistence-by-reachability-at- +
-commit
-
-|  true
-| Whether to run the "persistence-by-reachability" algorithm at commit time.
-
-This means that objects that were reachable at a call to makePersistent() but that are no longer persistent will be removed from persistence. For performance improvements, consider turning this off.
-
-
-|
-[[isis.datanucleus.schema.auto-create-all]]
-isis.datanucleus.schema. +
-auto-create-all
-
-| 
-| Whether DN should automatically create the database schema on bootstrapping.
-
-This should be set to ``true`` when running against an in-memory database, but set to ``false`` when running against a persistent database (use something like flyway instead to manage schema evolution).
-
-See also ``json`` (camelCasing instead of kebab-casing).
-
-NOTE: this config property isn't used by the core framework, but is used by one the flyway extension.
-
-
-|
-[[isis.datanucleus.schema.auto-create-database]]
-isis.datanucleus.schema. +
-auto-create-database
-
-| 
-| Previously we defaulted this property to "true", but that could cause the target database to be modified
-
-See also ``json`` (camelCasing instead of kebab-casing).
-
-NOTE: this config property isn't used by the framework, but is provided as a convenience for IDE autocomplete.
-
-
-|
-[[isis.datanucleus.schema.validate-all]]
-isis.datanucleus.schema. +
-validate-all
-
-|  true
-| See also ``json`` (camelCasing instead of kebab-casing).
-
-NOTE: this config property isn't used by the framework, but is provided as a convenience for IDE autocomplete.
-
-
 
 |===
 
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
index 7079e78..889b547 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
@@ -8,11 +8,12 @@
 ** xref:refguide:config:sections/isis.persistence.schema.adoc[Core Persistence Schema]
 ** xref:refguide:config:sections/isis.security.shiro.adoc[Shiro Security Implementation]
 ** xref:refguide:config:sections/isis.security.spring.adoc[Spring Security Implementation]
-** xref:refguide:config:sections/datanucleus.adoc[DataNucleus]
 ** xref:refguide:config:sections/isis.viewer.restfulobjects.adoc[Restful Objects Viewer]
 ** xref:refguide:config:sections/isis.viewer.wicket.adoc[Wicket Viewer]
+** xref:refguide:config:sections/datanucleus.adoc[DataNucleus Configuration]
+** xref:refguide:config:sections/resteasy.adoc[RestEasy Configuration]
 ** xref:refguide:config:sections/isis.extensions.adoc[Extensions]
 ** xref:refguide:config:sections/isis.value-types.adoc[Value types]
 ** xref:refguide:config:sections/isis.testing.adoc[Testing]
 ** xref:refguide:config:sections/isis.legacy.adoc[Legacy]
-** xref:refguide:config:sections/resteasy.adoc[RestEasy Configuration]
+** xref:refguide:config:sections/Other.adoc[Other]
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc b/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc
index 10faca9..34ec161 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/datanucleus.adoc
@@ -1,4 +1,4 @@
-= DataNucleus
+= DataNucleus Configuration
 :page-role: -toc -narrow
 
 
@@ -12,6 +12,14 @@ include::../section-hooks/datanucleus~pre.adoc[]
 |Default
 |Description
 |
+[[datanucleus]]
+datanucleus
+
+| 
+| null
+
+
+|
 [[datanucleus.cache.level2.mode]]
 datanucleus.cache.level2.mode
 
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc b/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
index 656362f..87573ec 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/resteasy.adoc
@@ -12,6 +12,14 @@ include::../section-hooks/resteasy~pre.adoc[]
 |Default
 |Description
 |
+[[resteasy]]
+resteasy
+
+| 
+| null
+
+
+|
 [[resteasy.jaxrs.app.registration]]
 resteasy.jaxrs.app.registration
 
diff --git a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
index e3638f2..6849c5a 100644
--- a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
+++ b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
@@ -8,8 +8,8 @@ It's also a useful reference to help you develop your own Apache Isis applicatio
 
 image::teaser-light.png[]
 
-The application is packaged up as a Docker image (link:https://hub.docker.com/r/apacheisis/demo-wicket/tags/[apacheisis/demo-wicket]) on Docker Hub, so you can easily run it yourself (as described <<Running the Docker Image,below>>).
-You can see also try out the application online, running link:https://demo-wicket.isis.incode.work[here].
+The application is packaged up as a Docker image (link:https://hub.docker.com/r/apacheisis/demo-wicket-jdo/tags/[apacheisis/demo-wicket-jdo] or link:https://hub.docker.com/r/apacheisis/demo-wicket-jpa/tags/[apacheisis/demo-wicket-jpa]) on Docker Hub, so you can easily run it yourself (as described <<Running the Docker Image,below>>).
+You can see also try out the application online, link:https://demo-wicket.jdo.isis.incode.work[jdo] or link:https://demo-wicket.jpa.isis.incode.work[jpa].
 
 == Prereqs
 
@@ -18,19 +18,21 @@ Head over to https://www.docker.com/community-edition[Docker] to install the com
 
 == Running the Docker Image
 
+Assuming the `jdo` variant (if using `jpa`, just substitute "jdo" with "jpa" in the commands below):
+
 * Pull the Demo image
 +
 [source,bash]
 ----
-docker pull apacheisis/demo-wicket:latest
+docker pull apacheisis/demo-wicket-jdo:latest
 ----
 
 * Running the Docker Image
 +
 [source,bash]
 ----
-docker pull apacheisis/demo-wicket:latest
-docker run -d -p8080:8080 apacheisis/demo-wicket:latest
+docker pull apacheisis/demo-wicket-jdo:latest
+docker run -d -p8080:8080 apacheisis/demo-wicket-jdo:latest
 ----
 +
 The Demo app can then be accessed at http://localhost:8080/wicket/[].
@@ -45,19 +47,19 @@ docker stop demo && docker rm demo
 
 === Customization
 
-The way in which the app is run by Docker be customised in a couple of ways:
-
+The way in which the app is run by Docker be customised in a couple of ways.
+Assuming the `jdo` variant (if using `jpa`, just substitute "jdo" with "jpa" in the commands below):
 
 * Prototyping mode
 +
 ----
-docker run -d -p8080:8080 -ePROTOTYPING=true apacheisis/demo-wicket:latest
+docker run -d -p8080:8080 -ePROTOTYPING=true apacheisis/demo-wicket-jdo:latest
 ----
 
 * Attached console
 +
 ----
-docker run -it -p8080:8080 apacheisis/demo-wicket:latest
+docker run -it -p8080:8080 apacheisis/demo-wicket-jdo:latest
 ----
 +
 Use CTRL-C to stop and detach
@@ -67,7 +69,7 @@ TIP: on Windows, you might need to prefix with `winpty`.
 * Specify a different context Path
 +
 ----
-docker run -d -p8080:8080 -eContextPath=/myPath apacheisis/demo-wicket:latest
+docker run -d -p8080:8080 -eContextPath=/myPath apacheisis/demo-wicket-jdo:latest
 ----
 +
 then access at http://localhost:8080/myPath/wicket/[].
diff --git a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
index b3aa3fc..67e5e2e 100644
--- a/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
+++ b/tooling/cli/adoc/modules/tooling-cli/examples/isis-tooling.yml
@@ -17,88 +17,88 @@
 #  under the License.
 #
 
-global:
-  namespacePartsSkipCount: 3
-
-  sections:
-    App: org.apache.isis.app.*
-    Mavendeps: org.apache.isis.mavendeps.*
-    Testing: org.apache.isis.testing.*
-    Examples: org.apache.isis.examples.*
-
-    Root: org.apache.isis
-    Commons: org.apache.isis.commons.*
-
-    Core: org.apache.isis.core.*
-
-    Persistence: org.apache.isis.persistence
-    JDO: "org.apache.isis.persistence:isis-persistence-jdo.*"
-    JPA: "org.apache.isis.persistence:isis-persistence-jpa.*"
-
-    Security: org.apache.isis.security
-    Bypass: "org.apache.isis.security:isis-security-bypass.*"
-    Keycloak: "org.apache.isis.security:isis-security-keycloak.*"
-    Shiro: "org.apache.isis.security:isis-security-shiro.*"
-
-    Viewer: org.apache.isis.viewer
-    "Restful Objects": "org.apache.isis.viewer:isis-viewer-restfulobjects.*"
-    Wicket: "org.apache.isis.viewer:isis-viewer-wicket.*"
-
-    Valuetypes: org.apache.isis.valuetypes.*
-    "Asciidoc": "org.apache.isis.valuetypes:isis-valuetypes-asciidoc.*"
-    "Markdown": "org.apache.isis.valuetypes:isis-valuetypes-markdown.*"
-    "SSE": "org.apache.isis.valuetypes:isis-valuetypes-ssec.*"
-
-    Mappings: org.apache.isis.mappings
-    #"Outbox Publisher": org.apache.isis.mappings:isis-mappings-jaxrsclient.*
-    "JAX-RS Client Library": "org.apache.isis.mappings:isis-mappings-jaxrsclient.*"
-    #Minio: "org.apache.isis.mappings:isis-mappings-minio.*"
-    "REST Client": "org.apache.isis.mappings:isis-mappings-restclient.*"
-    #"Slack Library": "org.apache.isis.mappings:isis-mappings-slack.*"
-
-    Extensions: org.apache.isis.extensions
-    "Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
-    "Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
-    #"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
-    "Core: Model Annotation": "org.apache.isis.extensions:isis-extensions-modelannotation.*"
-    "Core: Quartz": "org.apache.isis.extensions:isis-extensions-quartz.*"
-    #"Security: Audit Trail": "org.apache.isis.security:isis-extensions-audit-trail.*"
-    "Security: Secman": "org.apache.isis.security:isis-extensions-secman.*"
-    #"Security: Session Log": "org.apache.isis.security:isis-extensions-session-log.*"
-    "Security: Shiro LDAP Realm": "org.apache.isis.security:isis-extensions-shiro-realm-ldap.*"
-    "RO Viewer: CORS": "org.apache.isis.security:isis-extensions-cors.*"
-    "Wicket Viewer: Excel Download": "org.apache.isis.security:isis-extensions-exceldownload.*"
-    "Wicket Viewer: Full Calendar": "org.apache.isis.security:isis-extensions-fullcalendar.*"
-    #"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
-    "Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
-
-    Subdomains: org.apache.isis.subdomains
-    "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
-    #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
-    "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
-    #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
-    #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
-    #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
-    "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
-    "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
-    #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
-
-    "Tooling": org.apache.isis.tooling.*
-    "Regression Tests": org.apache.isis.regressiontests.*
-
-    Incubator: org.apache.isis.incubator
-    "Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
-    "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
-    "Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
-
-    Legacy: org.apache.isis.legacy.*
-
 
 commands:
   overview:
     description: "These tables summarize all Maven artifacts available with _Apache Isis_."
 
+    sections:
+      App: org.apache.isis.app.*
+      Mavendeps: org.apache.isis.mavendeps.*
+      Testing: org.apache.isis.testing.*
+      Examples: org.apache.isis.examples.*
+
+      Root: org.apache.isis
+      Commons: org.apache.isis.commons.*
+
+      Core: org.apache.isis.core.*
+
+      Persistence: org.apache.isis.persistence
+      JDO: "org.apache.isis.persistence:isis-persistence-jdo.*"
+      JPA: "org.apache.isis.persistence:isis-persistence-jpa.*"
+
+      Security: org.apache.isis.security
+      Bypass: "org.apache.isis.security:isis-security-bypass.*"
+      Keycloak: "org.apache.isis.security:isis-security-keycloak.*"
+      Shiro: "org.apache.isis.security:isis-security-shiro.*"
+
+      Viewer: org.apache.isis.viewer
+      "Restful Objects": "org.apache.isis.viewer:isis-viewer-restfulobjects.*"
+      Wicket: "org.apache.isis.viewer:isis-viewer-wicket.*"
+
+      Valuetypes: org.apache.isis.valuetypes.*
+      "Asciidoc": "org.apache.isis.valuetypes:isis-valuetypes-asciidoc.*"
+      "Markdown": "org.apache.isis.valuetypes:isis-valuetypes-markdown.*"
+      "SSE": "org.apache.isis.valuetypes:isis-valuetypes-ssec.*"
+
+      Mappings: org.apache.isis.mappings
+      #"Outbox Publisher": org.apache.isis.mappings:isis-mappings-jaxrsclient.*
+      "JAX-RS Client Library": "org.apache.isis.mappings:isis-mappings-jaxrsclient.*"
+      #Minio: "org.apache.isis.mappings:isis-mappings-minio.*"
+      "REST Client": "org.apache.isis.mappings:isis-mappings-restclient.*"
+      #"Slack Library": "org.apache.isis.mappings:isis-mappings-slack.*"
+
+      Extensions: org.apache.isis.extensions
+      "Core: Command Log": "org.apache.isis.extensions:isis-extensions-command-log.*"
+      "Core: Command Replay": "org.apache.isis.extensions:isis-extensions-command-replay.*"
+      #"Core: Flyway": "org.apache.isis.extensions:isis-extensions-flyway.*"
+      "Core: Model Annotation": "org.apache.isis.extensions:isis-extensions-modelannotation.*"
+      "Core: Quartz": "org.apache.isis.extensions:isis-extensions-quartz.*"
+      #"Security: Audit Trail": "org.apache.isis.security:isis-extensions-audit-trail.*"
+      "Security: Secman": "org.apache.isis.security:isis-extensions-secman.*"
+      #"Security: Session Log": "org.apache.isis.security:isis-extensions-session-log.*"
+      "Security: Shiro LDAP Realm": "org.apache.isis.security:isis-extensions-shiro-realm-ldap.*"
+      "RO Viewer: CORS": "org.apache.isis.security:isis-extensions-cors.*"
+      "Wicket Viewer: Excel Download": "org.apache.isis.security:isis-extensions-exceldownload.*"
+      "Wicket Viewer: Full Calendar": "org.apache.isis.security:isis-extensions-fullcalendar.*"
+      #"Wicket Viewer: Gmap3": "org.apache.isis.security:isis-extensions-gmap3.*"
+      "Wicket Viewer: Pdf.js": "org.apache.isis.security:isis-extensions-fullcalendar.*"
+
+      Subdomains: org.apache.isis.subdomains
+      "Base": "org.apache.isis.subdomains:isis-subdomains-base.*"
+      #"docx": "org.apache.isis.subdomains:isis-subdomains-docx.*"
+      "Excel": "org.apache.isis.subdomains:isis-subdomains-excel.*"
+      #"Freemarker": "org.apache.isis.subdomains:isis-subdomains-freemarker.*"
+      #"OGNL": "org.apache.isis.subdomains:isis-subdomains-ognl.*"
+      #"PDF Box": "org.apache.isis.subdomains:isis-subdomains-pdfbox.*"
+      "Spring": "org.apache.isis.subdomains:isis-subdomains-spring.*"
+      "XDocReport": "org.apache.isis.subdomains:isis-subdomains-xdocreport.*"
+      #"Zip": "org.apache.isis.subdomains:isis-subdomains-zip.*"
+
+      "Tooling": org.apache.isis.tooling.*
+      "Regression Tests": org.apache.isis.regressiontests.*
+
+      Incubator: org.apache.isis.incubator
+      "Kroviz Client": "org.apache.isis.incubator.clients:isis-client-kroviz.*"
+      "JavaFX Viewer": "org.apache.isis.incubator.viewer:isis-viewer-javafx.*"
+      "Vaadin Viewer": "org.apache.isis.incubator.viewer:isis-viewer-vaadin.*"
+
+      Legacy: org.apache.isis.legacy.*
+
   index:
+
+    namespacePartsSkipCount: 3
+
     fixOrphanedAdocIncludeStatements: false
     skipTitleHeader: false
     formatter: JAVA_SOURCES_WITH_SECTIONS
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
index cc1aa59..7c4058c 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
@@ -118,4 +118,4 @@ Normally for entities this is done using `Bs3GridPanelFactory`, this being the f
 You could, though, register your own `ComponentFactory` for entities that is targeted at a particular class of entity - some sort of object representing a dashboard, for example.
 It can use the `EntityModel` provided to it to determine the class of the entity, checking if it is of the appropriate type.
 
-The link:https://demo-wicket.isis.incode.work[demo app] includes an example of this technique (`Featured > Where in the World`).
+The demo app (link:https://demo-wicket.jdo.isis.incode.work[jdo] or link:https://demo-wicket.jpa.isis.incode.work[jpa]) includes an example of this technique (`Featured > Where in the World`).
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc
index 851cb6f..e7ab033 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/features/where-am-i.adoc
@@ -12,7 +12,7 @@ Domain objects that take part in such a navigable-tree-structure need to declare
 
 == Screenshots
 
-The following screenshot (from the link:https://demo-wicket.isis.incode.work/[demo app]) shows the navigation links below the top menu bar.
+The following screenshot (from the link:https://demo-wicket.jdo.isis.incode.work/[demo app]) shows the navigation links below the top menu bar.
 
 image::where-am-i/hello_grey_bg.png[width="720px"]