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/29 14:43:42 UTC
[isis] 01/19: ISIS-2062: fixes up module-nav's
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 14bbef3c3830135e234b707185a92956468adb10
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 27 08:21:35 2020 +0000
ISIS-2062: fixes up module-nav's
---
.../core/modules/ROOT/partials/module-nav.adoc | 2 +-
.../extensions/modules/ROOT/partials/module-nav.adoc | 2 +-
.../incubator/modules/ROOT/partials/module-nav.adoc | 4 +---
.../legacy/modules/ROOT/partials/module-nav.adoc | 3 +++
.../mappings/modules/ROOT/partials/module-nav.adoc | 1 +
.../refguide/modules/ROOT/partials/module-nav.adoc | 3 ++-
.../security/modules/ROOT/partials/component-nav.adoc | 4 +++-
.../partials/{module-nav2.adoc => module-nav-end.adoc} | 0
.../security/modules/ROOT/partials/module-nav.adoc | 5 ++++-
.../subdomains/modules/ROOT/partials/module-nav.adoc | 1 +
.../testing/modules/ROOT/partials/module-nav.adoc | 2 ++
.../pages/what-is-apache-isis/isis-in-pictures.adoc | 1 +
.../userguide/modules/ROOT/partials/module-nav.adoc | 4 ++++
.../pages/deployment/externalized-configuration.adoc | 2 +-
antora/components/userguide/modules/btb/pages/i18n.adoc | 2 +-
.../components/userguide/modules/btb/pages/web-xml.adoc | 2 +-
.../userguide/modules/btb/partials/module-nav.adoc | 14 +++++++-------
.../domain-services/event-subscribers.adoc | 2 +-
.../domain-services/initialization.adoc | 2 +-
.../programming-model/domain-services/registering.adoc | 2 +-
.../domain-services/scoped-services.adoc | 2 +-
.../fun/pages/programming-model/inject-services.adoc | 6 +++---
.../modules/fun/pages/programming-model/mixins.adoc | 2 +-
.../pages/programming-model/view-models/non-jaxb.adoc | 2 +-
.../fun/pages/ui-hints/object-titles-and-icons.adoc | 2 +-
.../userguide/modules/fun/partials/module-nav.adoc | 17 ++++++++---------
.../valuetypes/modules/ROOT/partials/module-nav.adoc | 4 ++++
.../main/adoc/modules/runtime-services/pages/about.adoc | 17 +++++++++++++----
.../modules/runtime-services/partials/module-nav.adoc | 2 +-
.../main/adoc/modules/webapp/partials/module-nav.adoc | 2 +-
core/webspringboot/src/main/adoc/antora.yml | 2 --
.../src/main/adoc/modules/webboot-springboot/nav.adoc | 1 -
.../adoc/modules/webboot-springboot/pages/about.adoc | 3 ---
.../modules/webboot-springboot/partials/module-nav.adoc | 1 -
34 files changed, 71 insertions(+), 50 deletions(-)
diff --git a/antora/components/core/modules/ROOT/partials/module-nav.adoc b/antora/components/core/modules/ROOT/partials/module-nav.adoc
index b28b04f..46becff 100644
--- a/antora/components/core/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/core/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-
+* xref:core:ROOT:about.adoc[Core Framework]
diff --git a/antora/components/extensions/modules/ROOT/partials/module-nav.adoc b/antora/components/extensions/modules/ROOT/partials/module-nav.adoc
index b28b04f..f6f714c 100644
--- a/antora/components/extensions/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-
+* xref:extensions:ROOT:about.adoc[About the Extensions]
diff --git a/antora/components/incubator/modules/ROOT/partials/module-nav.adoc b/antora/components/incubator/modules/ROOT/partials/module-nav.adoc
index b28b04f..fbb165d 100644
--- a/antora/components/incubator/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/incubator/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1 @@
-
-
-
+* xref:incubator:ROOT:about.adoc[About the Incubator]
diff --git a/antora/components/legacy/modules/ROOT/partials/module-nav.adoc b/antora/components/legacy/modules/ROOT/partials/module-nav.adoc
index b28b04f..0868297 100644
--- a/antora/components/legacy/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/legacy/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,6 @@
+* xref:legacy:ROOT:about.adoc[About the Legacy Catalog]
+
+
diff --git a/antora/components/mappings/modules/ROOT/partials/module-nav.adoc b/antora/components/mappings/modules/ROOT/partials/module-nav.adoc
index b28b04f..d19912f 100644
--- a/antora/components/mappings/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/mappings/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,4 @@
+* xref:mappings:ROOT:about.adoc[About the Bounded Context Mappings]
diff --git a/antora/components/refguide/modules/ROOT/partials/module-nav.adoc b/antora/components/refguide/modules/ROOT/partials/module-nav.adoc
index 283450e..2c7695d 100644
--- a/antora/components/refguide/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/refguide/modules/ROOT/partials/module-nav.adoc
@@ -1 +1,2 @@
-* Reference Guide
+* xref:refguide:ROOT:about.adoc[About the Reference Guides]
+
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index b4a276b..f6e2c5b 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -1,9 +1,11 @@
include::security:ROOT:partial$module-nav.adoc[]
+
include::security:core:partial$module-nav.adoc[]
include::security:bypass:partial$module-nav.adoc[]
include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
-include::security:ROOT:partial$module-nav2.adoc[]
+
+include::security:ROOT:partial$module-nav-end.adoc[]
* Extensions
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
diff --git a/antora/components/security/modules/ROOT/partials/module-nav2.adoc b/antora/components/security/modules/ROOT/partials/module-nav-end.adoc
similarity index 100%
rename from antora/components/security/modules/ROOT/partials/module-nav2.adoc
rename to antora/components/security/modules/ROOT/partials/module-nav-end.adoc
diff --git a/antora/components/security/modules/ROOT/partials/module-nav.adoc b/antora/components/security/modules/ROOT/partials/module-nav.adoc
index f5385ed..8b24a54 100644
--- a/antora/components/security/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/module-nav.adoc
@@ -1,4 +1,7 @@
-* xref:security:ROOT:domain-services-api-for-applications.adoc[Domain Services]
+* xref:security:ROOT:about.adoc[About the Security Guide]
+* xref:security:ROOT:domain-services-api-for-applications.adoc[Domain Services API]
+
+// usage by isis viewers is in module-nav-end.adoc
diff --git a/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc b/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
index b28b04f..de6dadf 100644
--- a/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/subdomains/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,4 @@
+* xref:incubator:ROOT:about.adoc[About the Subdomains]
diff --git a/antora/components/testing/modules/ROOT/partials/module-nav.adoc b/antora/components/testing/modules/ROOT/partials/module-nav.adoc
index a56d949..9404048 100644
--- a/antora/components/testing/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/testing/modules/ROOT/partials/module-nav.adoc
@@ -1,2 +1,4 @@
+* xref:testing:ROOT:about.adoc[About the Testing Guide]
+
* xref:testing:ROOT:overview.adoc[Overview]
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
index b7648ad..9947cd5 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
@@ -4,6 +4,7 @@
+WARNING: TODO: v2 - this material out of date, to be updated (need to migrate much of incode-platform, and port of isis-app-todoapp to github/apache/isis-app-todoapp)
On this page we want to show you what a modern Apache Isis application looks like.
diff --git a/antora/components/userguide/modules/ROOT/partials/module-nav.adoc b/antora/components/userguide/modules/ROOT/partials/module-nav.adoc
index e69de29..6b16313 100644
--- a/antora/components/userguide/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:userguide:ROOT:about.adoc[About the User Guide]
+
+
+
diff --git a/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc b/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
index 55cdf9b..ab26609 100644
--- a/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
+++ b/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
@@ -47,7 +47,7 @@ To tell Apache Isis to load configuration from an external directory, specify th
If the external configuration directory is fixed for all environments (systest, UAT, prod etc), then you can specify within the `web.xml` itself:
-// TODO: v2: this has almost certainly changed, because the configuration is picked up earlier; this probably no longer works.
+WARNING: TODO: v2: this has almost certainly changed, because the configuration is picked up earlier; this probably no longer works.
[source,xml]
----
diff --git a/antora/components/userguide/modules/btb/pages/i18n.adoc b/antora/components/userguide/modules/btb/pages/i18n.adoc
index 88481fe..f826aa7 100644
--- a/antora/components/userguide/modules/btb/pages/i18n.adoc
+++ b/antora/components/userguide/modules/btb/pages/i18n.adoc
@@ -622,7 +622,7 @@ However, Apache Isis can be configured to read config files from an xref:usergui
Thus, if in `web.xml` the external configuration directory has been set:
-// TODO: v2: this almost certainly no longer works, because we now set up configuration very early on.
+WARNING: TODO: v2: this almost certainly no longer works, because we now set up configuration very early on.
[source,xml]
----
diff --git a/antora/components/userguide/modules/btb/pages/web-xml.adoc b/antora/components/userguide/modules/btb/pages/web-xml.adoc
index 75c6385..5f4d719 100644
--- a/antora/components/userguide/modules/btb/pages/web-xml.adoc
+++ b/antora/components/userguide/modules/btb/pages/web-xml.adoc
@@ -4,7 +4,7 @@
:page-partial:
-// TODO: v2: a lot of this has changed, because we now use `WebModule_Xxx` instead of `web.xml`, ie set this stuff up programmatically.
+WARNING: TODO: v2: a lot of this has changed, because we now use `WebModule_Xxx` instead of `web.xml`, ie set this stuff up programmatically.
Apache Isis provides two different viewers, the xref:vw:ROOT:about.adoc[Wicket viewer] and the xref:vro:ROOT:about.adoc[RestfulObjects viewer].
diff --git a/antora/components/userguide/modules/btb/partials/module-nav.adoc b/antora/components/userguide/modules/btb/partials/module-nav.adoc
index eacedee..2c34602 100644
--- a/antora/components/userguide/modules/btb/partials/module-nav.adoc
+++ b/antora/components/userguide/modules/btb/partials/module-nav.adoc
@@ -1,8 +1,8 @@
-* xref:about.adoc[Beyond the Basics]
+* xref:userguide:btb:about.adoc[Beyond the Basics]
-** xref:i18n.adoc[i18n]
-** xref:headless-access.adoc[Headless Access]
-** xref:hints-and-tips.adoc[Hints-n-Tips]
-** xref:programming-model.adoc[Programming Model]
-** xref:deployment.adoc[Deployment]
-** xref:web-xml.adoc[web.xml]
+** xref:userguide:btb:i18n.adoc[i18n]
+** xref:userguide:btb:headless-access.adoc[Headless Access]
+** xref:userguide:btb:hints-and-tips.adoc[Hints-n-Tips]
+** xref:userguide:btb:programming-model.adoc[Programming Model]
+** xref:userguide:btb:deployment.adoc[Deployment]
+** xref:userguide:btb:web-xml.adoc[web.xml]
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
index f0ff68d..8c2bb37 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/event-subscribers.adoc
@@ -3,7 +3,7 @@
:page-partial:
-// TODO: v2: update for Spring events rather than axon/guava
+WARNING: TODO: v2: update for Spring events rather than axon/guava
Domain services acting as event subscribers can subscribe to xref:userguide:fun:building-blocks.adoc#lifecycle-events[lifecycle] events, influencing the rendering and behaviour of other objects.
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
index d3334f2..42f5f60 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/initialization.adoc
@@ -3,7 +3,7 @@
:page-partial:
-// TODO: v2: support for init with a Map is no longer supported, I suspect...? Instead, can x-ref Spring's strongly typed configuration beans
+WARNING: TODO: v2: support for init with a Map is no longer supported, I suspect...? Instead, can x-ref Spring's strongly typed configuration beans
Services can optionally declare lifecycle callbacks to initialize them (when the app is deployed) and to shut them down (when the app is undeployed).
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
index e360730..29e064a 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/registering.adoc
@@ -3,7 +3,7 @@
:page-partial:
-// TODO: v2: this is out of date, need to xref Spring Boot mechanism instead.
+WARNING: TODO: v2: this is out of date, need to xref Spring Boot mechanism instead.
The easiest way to register domain services with the framework is to use an xref:refguide:applib-cm:classes/AppManifest-bootstrapping.adoc[`AppManifest`].
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
index 9584c87..b90388a 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/domain-services/scoped-services.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 [...]
:page-partial:
-// TODO: v2: extend this/fix for Spring Boot scopes; does it support CDI annotation? which other scopes are supported?
+WARNING: TODO: v2: extend this/fix for Spring Boot scopes; does it support CDI annotation? which other scopes are supported?
By default all domain services are considered to be singletons, and thread-safe.
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc b/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
index 2f80f76..72dc2b3 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/inject-services.adoc
@@ -79,7 +79,7 @@ Note that the method name can be anything; it doesn't need to be related to the
== Constructor injection
-TODO: v2: this is now supported, because of Spring Boot, I think.
+NOTE: TODO: v2: this is now supported, because of Spring Boot, I think.
== Multiple Implementations
@@ -93,13 +93,13 @@ When there are multiple service implementations of a given type, annotate the di
== Scoping
-TODO: v2: should describe how this works.
+WARNING: TODO: v2: should describe how this works.
== Qualified Injection
-TODO: v2: x-ref to Spring Boot docs.
+NOTE: TODO: v2: x-ref to Spring Boot docs.
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc b/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
index a695a3b..4ef8f71 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/mixins.adoc
@@ -7,7 +7,7 @@ A xref:userguide:fun:building-blocks.adoc#mixins[mixin] acts like a trait or ext
Syntactically, a mixin is defined using either the xref:refguide:applib-ant:Mixin.adoc[`@Mixin`] annotation or using xref:refguide:applib-ant:DomainObject.adoc#nature[`@DomainObject#nature()`] attribute (specifying a nature of `Nature.MIXIN`).
-// TODO: v2: perhaps we should get rid of @DomainObject#nature=MIXIN ?
+WARNING: TODO: v2: perhaps we should get rid of @DomainObject#nature=MIXIN ?
[source,java]
----
diff --git a/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc b/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
index 5d7be24..6ba7096 100644
--- a/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
+++ b/antora/components/userguide/modules/fun/pages/programming-model/view-models/non-jaxb.adoc
@@ -9,7 +9,7 @@ Instead of using JAXB to specify a view model, it is also possible to use Apache
As was explained xref:userguide:fun:programming-model.adoc#view-models[earlier], the approach is described here is neither as flexible nor as powerful as using the JAXB-style of view models.
It is however likely to be faster.
-// TODO: v2: I think we should only support programmatic API (ViewModel), and JAXB.
+WARNING: TODO: v2: I think we should only support programmatic API (ViewModel), and JAXB.
// So let's get rid of all these other natures that, under the covers, are all our original poor-man's JAXB (ie, EXTERNAL_ENTITY, INMEMORY_ENTITY, VIEW_MODEL, and @ViewModel itself).
diff --git a/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
index 7c63c5a..0e34465 100644
--- a/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
+++ b/antora/components/userguide/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
@@ -231,7 +231,7 @@ public class Order {
The subscriber can then populate this event:
-// *TODO: v2: *what annotation is required for SpringBoot event subscribers?
+WARNING: TODO: v2: what annotation is required for SpringBoot event subscribers?
[source,java]
----
diff --git a/antora/components/userguide/modules/fun/partials/module-nav.adoc b/antora/components/userguide/modules/fun/partials/module-nav.adoc
index bfa3115..25a0fa2 100644
--- a/antora/components/userguide/modules/fun/partials/module-nav.adoc
+++ b/antora/components/userguide/modules/fun/partials/module-nav.adoc
@@ -1,21 +1,20 @@
-* xref:about.adoc[Fundamentals]
+* xref:userguide:fun:about.adoc[Fundamentals]
-
-** xref:core-concepts.adoc[Core Concepts]
+** xref:userguide:fun:core-concepts.adoc[Core Concepts]
** xref:userguide:fun:building-blocks.adoc[Building Blocks]
-** xref:programming-model.adoc[Programming Model]
+** xref:userguide:fun:programming-model.adoc[Programming Model]
-** xref:ui-hints.adoc[UI Hints]
+** xref:userguide:fun:ui-hints.adoc[UI Hints]
-** xref:crud.adoc[CRUD]
+** xref:userguide:fun:crud.adoc[CRUD]
-** xref:business-rules.adoc[Business Rules]
+** xref:userguide:fun:business-rules.adoc[Business Rules]
-** xref:drop-downs-and-defaults.adoc[Drop downs and Defaults]
+** xref:userguide:fun:drop-downs-and-defaults.adoc[Drop downs and Defaults]
-** xref:available-domain-services.adoc[Available Domain Services]
+** xref:userguide:fun:available-domain-services.adoc[Available Domain Services]
diff --git a/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc b/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
index b28b04f..b3cef64 100644
--- a/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/valuetypes/modules/ROOT/partials/module-nav.adoc
@@ -1,3 +1,7 @@
+* xref:incubator:ROOT:about.adoc[About the Value Types Catalog]
+
+
+
diff --git a/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc
index 4c7e2e8..64b0690 100644
--- a/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc
+++ b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc
@@ -1,6 +1,17 @@
-= Framework Internal Services
+= Runtime (non-API) Services
+: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 [...]
+:page-role: -toc -title
-This guide documents a number of domain services that are not part of the framework's formal API, they use classes that are outside of the applib. They should be
+
+WARNING: TODO: v2: to be updated
+
+
+This Maven module contains implementations of both public API services (as defined in the applib) and also non-API classes.
+
+See the xref:refguide:applib-svc:[Domain Services Referenc e Guide] for details on the public API services.
+
+This documentation relates only to the non-API services
+These documents should be
thought of as part of the internal design of the framework, and are liable to change from release to release.
@@ -10,5 +21,3 @@ We do not guarantee that link:http://semver.org[semantic versioning] will be hon
====
-
-
diff --git a/core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc
index 380ab44..3e51470 100644
--- a/core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc
+++ b/core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc
@@ -1,4 +1,4 @@
-* xref:core:runtime-services:about.adoc[Framework Internal Services]
+* xref:core:runtime-services:about.adoc[Runtime Services]
** xref:core:runtime-services:presentation-layer.adoc[Presentation Layer]
*** xref:core:runtime-services:presentation-layer/ContentNegotiationService.adoc[ContentNegotiationService]
diff --git a/core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc b/core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc
index d2fe2f2..291b567 100644
--- a/core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc
+++ b/core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc
@@ -1 +1 @@
-* xref:core:runtime-web:about.adoc[Runtime Web]
+* xref:core:webapp:about.adoc[Webapp]
diff --git a/core/webspringboot/src/main/adoc/antora.yml b/core/webspringboot/src/main/adoc/antora.yml
deleted file mode 100644
index 576eb80..0000000
--- a/core/webspringboot/src/main/adoc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: vro
-version: master
diff --git a/core/webspringboot/src/main/adoc/modules/webboot-springboot/nav.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/nav.adoc
deleted file mode 100644
index 3e815f1..0000000
--- a/core/webspringboot/src/main/adoc/modules/webboot-springboot/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::core:ROOT:partial$component-nav.adoc[]
diff --git a/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc
deleted file mode 100644
index 666722c..0000000
--- a/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Runtime Spring
-
-
diff --git a/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc
deleted file mode 100644
index 614006d..0000000
--- a/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:core:webboot-springboot:about.adoc[SpringBoot]