You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/18 06:32:24 UTC
[isis] 04/13: ISIS-2062: moves ug-vw alongside code,
and renames to just 'Wicket Viewer'.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit be007682800a7fd2d9122f6257e8433d9694d4b6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 18 08:10:03 2019 +0200
ISIS-2062: moves ug-vw alongside code, and renames to just 'Wicket Viewer'.
---
.../ug-sec/modules/ROOT/pages/hints-and-tips.adoc | 2 +-
.../ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc | 8 ++++----
antora/components/ug/modules/ROOT/pages/about.adoc | 2 +-
antora/components/ug/modules/btb/pages/headless-access.adoc | 2 +-
antora/components/ug/modules/btb/pages/hints-and-tips.adoc | 2 +-
.../ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc | 2 +-
.../btb/pages/hints-and-tips/transactions-and-errors.adoc | 4 ++--
antora/components/ug/modules/btb/pages/i18n.adoc | 8 ++++----
antora/components/ug/modules/btb/pages/web-xml.adoc | 2 +-
antora/components/ug/modules/fun/pages/about.adoc | 2 +-
.../modules/fun/pages/building-blocks/identifiers/oid.adoc | 2 +-
.../identifiers/title-and-icon-and-css-class.adoc | 2 +-
.../ug/modules/fun/pages/building-blocks/metamodel.adoc | 2 +-
.../types-of-domain-objects/domain-services.adoc | 2 +-
.../types-of-domain-objects/view-models.adoc | 4 ++--
.../fun/pages/core-concepts/apache-isis-vs/cqrs.adoc | 2 +-
.../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc | 2 +-
.../ug/modules/fun/pages/core-concepts/principles.adoc | 2 +-
.../pages/core-concepts/principles/for-the-long-term.adoc | 2 +-
.../components/ug/modules/fun/pages/programming-model.adoc | 2 +-
.../ug/modules/fun/pages/programming-model/collections.adoc | 2 +-
.../fun/pages/programming-model/domain-services/menu.adoc | 2 +-
.../domain-services/organizing-services.adoc | 4 ++--
.../ug/modules/fun/pages/programming-model/properties.adoc | 4 ++--
.../ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc | 2 +-
antora/components/ug/modules/fun/pages/ui-hints/layout.adoc | 2 +-
.../modules/fun/pages/ui-hints/object-titles-and-icons.adoc | 8 ++++----
.../ug-vw => core/viewer-wicket/_adoc}/antora.yml | 4 ++--
.../ug-vw => core/viewer-wicket/_adoc}/examples.csv | 0
.../viewer-wicket/_adoc}/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT/assets/images/about-page/about-page.png | Bin
.../ROOT/assets/images/application-menu/dividers.png | Bin
.../ROOT/assets/images/application-menu/layout-menus.pdn | Bin
.../ROOT/assets/images/application-menu/layout-menus.png | Bin
.../ROOT/assets/images/application-menu/tertiary.png | Bin
.../images/blob-attachments/010-attachment-field-940.png | Bin
.../assets/images/blob-attachments/010-attachment-field.png | Bin
.../images/blob-attachments/020-edit-choose-file-940.png | Bin
.../assets/images/blob-attachments/020-edit-choose-file.png | Bin
.../blob-attachments/030-choose-file-using-browser-520.png | Bin
.../blob-attachments/030-choose-file-using-browser.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated-940.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered-940.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered.png | Bin
.../assets/images/blob-attachments/060-download-940.png | Bin
.../ROOT/assets/images/blob-attachments/060-download.png | Bin
.../assets/images/blob-attachments/070-edit-clear-940.png | Bin
.../ROOT/assets/images/blob-attachments/070-edit-clear.png | Bin
.../ROOT/assets/images/bookmarked-pages/panel-940.png | Bin
.../assets/images/bookmarked-pages/panel-estatio-940.png | Bin
.../ROOT/assets/images/bookmarked-pages/panel-estatio.png | Bin
.../modules/ROOT/assets/images/bookmarked-pages/panel.png | Bin
.../ROOT/assets/images/brand-logo/brand-logo-signin.png | Bin
.../modules/ROOT/assets/images/brand-logo/brand-logo.png | Bin
.../assets/images/copy-link/010-copy-link-button-940.png | Bin
.../ROOT/assets/images/copy-link/010-copy-link-button.png | Bin
.../assets/images/copy-link/020-copy-link-dialog-940.png | Bin
.../ROOT/assets/images/copy-link/020-copy-link-dialog.png | Bin
.../modules/ROOT/assets/images/copy-link/030-hints-940.png | Bin
.../modules/ROOT/assets/images/copy-link/030-hints.png | Bin
.../images/copy-link/040-copy-link-with-hints-940.png | Bin
.../assets/images/copy-link/040-copy-link-with-hints.png | Bin
.../ROOT/assets/images/copy-link/050-title-url-940.png | Bin
.../modules/ROOT/assets/images/copy-link/050-title-url.png | Bin
.../_adoc}/modules/ROOT/assets/images/dialog-mode/modal.png | Bin
.../modules/ROOT/assets/images/dialog-mode/sidebar.png | Bin
.../modules/ROOT/assets/images/embedded-view/no-footer.png | Bin
.../assets/images/embedded-view/no-header-no-footer.png | Bin
.../modules/ROOT/assets/images/embedded-view/no-header.png | Bin
.../modules/ROOT/assets/images/embedded-view/regular.png | Bin
.../assets/images/features/recent-pages/recent-pages.png | Bin
.../ui-hints/object-titles-and-icons/cust-order-product.png | Bin
.../assets/images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../ROOT/assets/images/layout-dynamic-xml/ToDoItem.png | Bin
.../modules/ROOT/assets/images/layouts/customer-order.png | Bin
.../modules/ROOT/assets/images/layouts/estatio-Invoice.png | Bin
.../modules/ROOT/assets/images/layouts/estatio-Lease.png | Bin
.../ROOT/assets/images/layouts/estatio-LeaseItem.png | Bin
.../modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png | Bin
.../modules/ROOT/assets/images/menubars/010-download.png | Bin
.../modules/ROOT/assets/images/menubars/020-download.png | Bin
.../modules/ROOT/assets/images/reference-layout/4-0-8-0.png | Bin
.../ROOT/assets/images/reference-layout/4-4-4-12.png | Bin
.../ROOT/assets/images/reference-layout/6-6-0-12.png | Bin
.../images/reference-layout/isis-layout-show-facets.css | 0
.../ROOT/assets/images/reference-layout/isis-layout.css | 0
.../ROOT/assets/images/reference-layout/layout-4-0-8-0.html | 0
.../assets/images/reference-layout/layout-4-4-4-12.html | 0
.../assets/images/reference-layout/layout-6-6-0-12.html | 0
.../images/suppress-password-reset}/login-page-default.png | Bin
.../login-page-suppress-password-reset.png | Bin
.../images/suppress-remember-me}/login-page-default.png | Bin
.../login-page-suppress-remember-me.png | Bin
.../assets/images/suppress-sign-up}/login-page-default.png | Bin
.../images/suppress-sign-up/login-page-suppress-sign-up.png | Bin
.../modules/ROOT/assets/images/theme-chooser/example-1.png | Bin
.../modules/ROOT/assets/images/theme-chooser/example-2.png | Bin
.../assets/images/user-registration}/login-page-default.png | Bin
.../images/user-registration/sign-up-after-registration.png | Bin
.../sign-up-email-with-verification-link.png | Bin
.../user-registration/sign-up-login-page-after-sign-up.png | Bin
.../ROOT/assets/images/user-registration/sign-up-page.png | Bin
.../images/user-registration/sign-up-registration-page.png | Bin
.../modules/ROOT/assets/images/where-am-i/hello_grey_bg.png | Bin
.../viewer-wicket/_adoc/modules/ROOT/examples}/.gitkeep | 0
.../viewer-wicket/_adoc}/modules/ROOT/nav.adoc | 0
.../_adoc}/modules/ROOT/pages/_attributes.adoc | 0
.../_adoc/modules/ROOT/pages/_partials}/_attributes.adoc | 0
.../viewer-wicket/_adoc}/modules/ROOT/pages/about.adoc | 0
.../_adoc}/modules/ROOT/pages/configuration-properties.adoc | 0
.../_adoc}/modules/ROOT/pages/customisation.adoc | 0
.../modules/ROOT/pages/customisation}/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/customisation/about-page.adoc | 0
.../modules/ROOT/pages/customisation/auto-refresh.adoc | 0
.../_adoc}/modules/ROOT/pages/customisation/brand-logo.adoc | 0
.../ROOT/pages/customisation/cheap-n-cheerful-theme.adoc | 0
.../modules/ROOT/pages/customisation/custom-javascript.adoc | 0
.../ROOT/pages/customisation/request-parameters.adoc | 0
.../ROOT/pages/customisation/top-level-index-page.adoc | 0
.../ROOT/pages/customisation/tweaking-css-classes.adoc | 0
.../ROOT/pages/customisation/using-different-css-file.adoc | 0
.../modules/ROOT/pages/customisation/welcome-page.adoc | 0
.../viewer-wicket/_adoc}/modules/ROOT/pages/extending.adoc | 0
.../_adoc/modules/ROOT/pages/extending}/_attributes.adoc | 0
.../ROOT/pages/extending/custom-bootstrap-theme.adoc | 0
.../_adoc}/modules/ROOT/pages/extending/custom-pages.adoc | 0
.../pages/extending/login-via-query-args-prototyping.adoc | 0
.../ROOT/pages/extending/replacing-page-elements.adoc | 0
.../viewer-wicket/_adoc}/modules/ROOT/pages/features.adoc | 0
.../_adoc}/modules/ROOT/pages/features/_attributes.adoc | 0
.../modules/ROOT/pages/features/blob-attachments.adoc | 0
.../modules/ROOT/pages/features/bookmarked-pages.adoc | 0
.../modules/ROOT/pages/features/hints-and-copy-url.adoc | 0
.../_adoc}/modules/ROOT/pages/features/recent-pages.adoc | 0
.../ROOT/pages/features/sidebar-vs-modal-dialogs.adoc | 0
.../modules/ROOT/pages/features/titles-in-tables.adoc | 0
.../modules/ROOT/pages/features/user-registration.adoc | 0
.../_adoc}/modules/ROOT/pages/features/where-am-i.adoc | 0
.../_adoc}/modules/ROOT/pages/hints-and-tips.adoc | 0
.../modules/ROOT/pages/hints-and-tips}/_attributes.adoc | 0
.../ROOT/pages/hints-and-tips/highlight-current-row.adoc | 0
.../pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc | 0
.../modules/ROOT/pages/hints-and-tips/per-user-themes.adoc | 0
.../modules/ROOT/pages/hints-and-tips/svg-support.adoc | 0
.../_adoc}/modules/ROOT/pages/incode-platform.adoc | 0
.../viewer-wicket/_adoc}/modules/ROOT/pages/layout.adoc | 0
.../_adoc/modules/ROOT/pages/layout}/_attributes.adoc | 0
.../_adoc}/modules/ROOT/pages/layout/annotation-based.adoc | 0
.../_adoc}/modules/ROOT/pages/layout/file-based.adoc | 0
.../_adoc}/modules/ROOT/pages/layout/table-columns.adoc | 0
.../_adoc}/modules/ROOT/pages/menubars-layout.adoc | 0
.../modules/ROOT/pages/menubars-layout}/_attributes.adoc | 0
.../ROOT/pages/menubars-layout/annotation-based.adoc | 0
.../modules/ROOT/pages/menubars-layout/file-based.adoc | 0
.../ug-vw => core/viewer-wicket/_adoc}/sync_examples.sh | 0
site.yml | 2 +-
158 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
index fdc6762..a6d626a 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/hints-and-tips.adoc
@@ -11,7 +11,7 @@ See also hints-n-tips chapters in the:
* the xref:support:dg:hints-and-tips.adoc[Developers'] guide
-* the xref:ug-vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
diff --git a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
index 463bb04..8778e79 100644
--- a/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
+++ b/antora/components/ug-sec/modules/ROOT/pages/usage-by-isis-viewers.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
-By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:ug-vw:ROOT:about.adoc[Wicket Viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
+By and large the security mechanisms within Isis are transparent to the rest of the framework (the xref:vw:ROOT::about.adoc[Wicket Viewer] and xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], and the overall xref:rg:cfg:about[core runtime]).
That said, it is the responsibility of the viewers to ensure that for each request there is a valid user session present. The sections below explain how this works.
@@ -13,7 +13,7 @@ That said, it is the responsibility of the viewers to ensure that for each reque
== Wicket Viewer
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] defines a relatively small number of pages (by which we mean subclasses of `org.apache.wicket.markup.html.WebPage`):
+The xref:vw:ROOT::about.adoc[Wicket viewer] defines a relatively small number of pages (by which we mean subclasses of `org.apache.wicket.markup.html.WebPage`):
* about page
* entity page
@@ -34,7 +34,7 @@ which means that they can only be accessed by a user with an authenticated sessi
[TIP]
====
-The sign-in page to render is pluggable; see xref:ug-vw:ROOT:extending/custom-pages.adoc[extensions chapter] for details.
+The sign-in page to render is pluggable; see xref:vw:ROOT::extending/custom-pages.adoc[extensions chapter] for details.
====
In the sign-in page the viewer calls to the Isis Authenticator API, and obtains back a user/role. It also adds in its special reserved role (per the annotation above) and then continues on to whichever page the user was attempting to access (usually the home page).
@@ -52,7 +52,7 @@ These pages all "reach inside" Apache Isis framework using a mechanism similar t
[TIP]
====
-The sign-in verification page to render is pluggable; see xref:ug-vw:ROOT:extending/custom-pages.adoc[extensions chapter] for details.
+The sign-in verification page to render is pluggable; see xref:vw:ROOT::extending/custom-pages.adoc[extensions chapter] for details.
====
User registration is only available if the xref:rg:svc:persistence-layer-spi/UserRegistrationService.adoc[`UserRegistrationService`] is configured; this is used by the framework to actually create new instances of the user as accessed by the corresponding (Shiro) realm.
diff --git a/antora/components/ug/modules/ROOT/pages/about.adoc b/antora/components/ug/modules/ROOT/pages/about.adoc
index 64d3ad4..229ab71 100644
--- a/antora/components/ug/modules/ROOT/pages/about.adoc
+++ b/antora/components/ug/modules/ROOT/pages/about.adoc
@@ -6,7 +6,7 @@ Apache Isis documentation is broken out into a number of user, reference and "su
The user guides available are:
* xref:ug:fun:about.adoc[Fundamentals]
-* xref:ug-vw:ROOT:about.adoc[Wicket viewer]
+* xref:vw:ROOT::about.adoc[Wicket viewer]
* xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
* xref:ug-odn:ROOT:about.adoc[DataNucleus object store]
* xref:ug-sec:ROOT:about.adoc[Security]
diff --git a/antora/components/ug/modules/btb/pages/headless-access.adoc b/antora/components/ug/modules/btb/pages/headless-access.adoc
index e08746a..b4890f9 100644
--- a/antora/components/ug/modules/btb/pages/headless-access.adoc
+++ b/antora/components/ug/modules/btb/pages/headless-access.adoc
@@ -2,7 +2,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
-This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:ug-vw:ROOT:about.adoc[Wicket] or xref:ug-vro:ROOT:about.adoc[Restful] viewers.
+This section tackles the topic of enabling access to an Apache Isis application directly, or at least, not through either the xref:vw:ROOT::about.adoc[Wicket] or xref:ug-vro:ROOT:about.adoc[Restful] viewers.
There are several main use-cases:
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
index a1b453e..1a0f303 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips.adoc
@@ -10,7 +10,7 @@ See also hints-n-tips chapters in the:
* the xref:support:dg:hints-and-tips.adoc[Developers'] guide
-* the xref:ug-vw:ROOT:hints-and-tips.adoc[Wicket viewer] guide
+* the xref:vw:ROOT::hints-and-tips.adoc[Wicket viewer] guide
* the xref:ug-vro:ROOT:hints-and-tips.adoc[Restful Objects viewer] guide
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
index b2f0b43..b84f2b9 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips/are-you-sure.adoc
@@ -40,7 +40,7 @@ image::hints-and-tips/are-you-sure.png[link="{imagesdir}/hints-and-tips/are-you-
[NOTE]
====
-Note that these screenshots shows an earlier version of the xref:ug-vw:ROOT:about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that these screenshots shows an earlier version of the xref:vw:ROOT::about.adoc[Wicket viewer] UI (specifically, pre 1.8.0).
====
If the user checks the box:
diff --git a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
index 4c3c1d2..a095da7 100644
--- a/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
+++ b/antora/components/ug/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
@@ -39,7 +39,7 @@ You get the idea.
== Raise message in the UI
The framework provides the xref:rg:svc:application-layer-api/MessageService.adoc[`MessageService`] as a means to return an out-of-band
-message to the end-user. In the xref:ug-vw:ROOT:about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
+message to the end-user. In the xref:vw:ROOT::about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
xref:ug-vro:ROOT:about.adoc[Restful Objects viewer] returns an HTTP header.
The `UserService` provides three APIs, for different:
@@ -56,7 +56,7 @@ None of these messages/errors has any influence on the transaction; any changes
== Aborting transactions
If you want to abort Apache Isis' transaction, this can be done by throwing an exception. The exception message
-is displayed to the user on the error page (if xref:ug-vw:ROOT:about.adoc[Wicket viewer]) or a 500 status error code (if the
+is displayed to the user on the error page (if xref:vw:ROOT::about.adoc[Wicket viewer]) or a 500 status error code (if the
xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer).
If the exception thrown is because of an unexpected error (eg a `NullPointerException` in the domain app itself), then
diff --git a/antora/components/ug/modules/btb/pages/i18n.adoc b/antora/components/ug/modules/btb/pages/i18n.adoc
index 8512614..d62fc4f 100644
--- a/antora/components/ug/modules/btb/pages/i18n.adoc
+++ b/antora/components/ug/modules/btb/pages/i18n.adoc
@@ -7,7 +7,7 @@ Apache Isis' support for internationlization (i18n) allows every element of the
It also supports translations of messages raised imperatively, by which we mean as the result of a call to `title()` to obtain an object's title, or messages resulting from any business rule violations (eg xref:rg:cms:methods/prefixes/disable.adoc[`disable...()`] or xref:rg:cms:methods/prefixes/validate.adoc[`validate...()`], and so on.
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] (that is, its labels and messages) is also internationalized using the same mechanism.
+The xref:vw:ROOT::about.adoc[Wicket viewer] (that is, its labels and messages) is also internationalized using the same mechanism.
If no translations are available, then the Wicket viewer falls back to using Wicket resource bundles.
Isis does not translate the values of your domain objects, though.
@@ -234,7 +234,7 @@ If returns `null`, then the `Exception#getMessage()` is used as a fallback
== Wicket Viewer
-The xref:ug-vw:ROOT:about.adoc[Wicket viewer] (its labels and messages) is also internationalized using
+The xref:vw:ROOT::about.adoc[Wicket viewer] (its labels and messages) is also internationalized using
the `TranslationService`.
This is done through an Isis-specific implementation of the Wicket framework's `org.apache.wicket.Localizer` class, namely `LocalizerForIsis`.
@@ -334,7 +334,7 @@ msgstr "You can only select 1 item"
=== Login/self-sign-up
In addition, there are a reasonably large number of messages that are used for both login and the
- xref:ug-vw:ROOT:features/user-registration.adoc[user registration] (self sign-up) and password reset features.
+ xref:vw:ROOT::features/user-registration.adoc[user registration] (self sign-up) and password reset features.
These are:
@@ -550,7 +550,7 @@ msgid "<i>Quantity</i>"
msgstr "<i>Quantité</i>"
----
-For this to work, the `namedEscaped()` attribute must be specified using either the xref:ug-vw:ROOT:layout/file-based.adoc[layout file], or using an annotation such as xref:rg:ant:PropertyLayout.adoc[`@PropertyLayout`] or xref:rg:ant:ParameterLayout.adoc[`@ParameterLayout`].
+For this to work, the `namedEscaped()` attribute must be specified using either the xref:vw:ROOT::layout/file-based.adoc[layout file], or using an annotation such as xref:rg:ant:PropertyLayout.adoc[`@PropertyLayout`] or xref:rg:ant:ParameterLayout.adoc[`@ParameterLayout`].
For example:
diff --git a/antora/components/ug/modules/btb/pages/web-xml.adoc b/antora/components/ug/modules/btb/pages/web-xml.adoc
index 7905fbf..d239b30 100644
--- a/antora/components/ug/modules/btb/pages/web-xml.adoc
+++ b/antora/components/ug/modules/btb/pages/web-xml.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
// 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:ug-vw:ROOT:about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
+Apache Isis provides two different viewers, the xref:vw:ROOT::about.adoc[Wicket viewer] and the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer].
You can deploy both of these concurrently, or deploy just the Wicket viewer, or deploy just the Restful Objects viewer.
The configuration in `web.xml` varies accordingly, both in terms of the servlet context listeners, filters and servlets.
diff --git a/antora/components/ug/modules/fun/pages/about.adoc b/antora/components/ug/modules/fun/pages/about.adoc
index 0b1aaee..94e7341 100644
--- a/antora/components/ug/modules/fun/pages/about.adoc
+++ b/antora/components/ug/modules/fun/pages/about.adoc
@@ -3,7 +3,7 @@ include::_attributes.adoc[]
This guide introduces the xref:ug:fun:core-concepts.adoc[core concepts] and the xref:ug:fun:building-blocks.adoc[building blocks] of Apache Isis, and tells you how to xref:helloworld:ROOT:about.adoc[get started] with a Maven archetype.
-It describes in some detail the conventions of Apache Isis' xref:ug:fun:programming-model.adoc[programming model]s, describes how to influence the xref:ug-vw:ROOT:layout.adoc[UI layout] of your domain objects , and it catalogues various xref:support:dg:hints-and-tips.adoc.adoc[FAQ]s.
+It describes in some detail the conventions of Apache Isis' xref:ug:fun:programming-model.adoc[programming model]s, describes how to influence the xref:vw:ROOT::layout.adoc[UI layout] of your domain objects , and it catalogues various xref:support:dg:hints-and-tips.adoc.adoc[FAQ]s.
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
index 5fc3d93..8236a8c 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/oid.adoc
@@ -29,7 +29,7 @@ When the PDF is scanned by the mail room, the barcode could be read to attach th
* similarly within implementations of xref:rg:svc:persistence-layer-spi/PublisherService.adoc[`PublisherService`] to persist published action invocations
-* and of course both the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and xref:ug-vw:ROOT:about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
+* and of course both the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] and xref:vw:ROOT::about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
Although the exact content of an OID should be considered opaque by domain objects, it is possible for domain objects to obtain OIDs.
These are represented as ``Bookmark``s, obtained from the xref:rg:svc:integration-api/BookmarkService.adoc[``BookmarkService``].
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
index f70d570..0a7574d 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/identifiers/title-and-icon-and-css-class.adoc
@@ -22,7 +22,7 @@ For example, a shipped `Order` might have a slightly different icon to a yet-to-
== CSS Class
In addition to the title and icon, it is also possible for a domain object to provide a CSS class hint.
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
[TIP]
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc b/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
index 5e1d316..94a8370 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/metamodel.adoc
@@ -18,7 +18,7 @@ This is an ORM that implements the JDO and JPA APIs, and which can map domain ob
Apache Isis recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowsNull=...)`.
In addition, the framework builds up the metamodel for each domain object using
-xref:ug-vw:ROOT:layout.adoc[layout hints], such as `Customer.layout.xml`.
+xref:vw:ROOT::layout.adoc[layout hints], such as `Customer.layout.xml`.
These provide metadata such as grouping elements of the UI together, using multi-column layouts, and so on.
The layout file can be modified while the application is still running, and are picked up automatically; a useful way to speed up feedback.
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
index adf5d8f..7ecefff 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/domain-services.adoc
@@ -15,7 +15,7 @@ Similarly, entities might also have a corresponding factory service: a `Customer
On the other hand, from an end-users' perspective the act of finding an existing object vs creating a new one are quite closely related.
For this reason, in Apache Isis it's therefore quite common to have a single domain service that acts as both a factory and a repository (and is usually called just a "repository").
-The behaviour of these services is rendered in various ways, though the most obvious is as the menu actions on the top-level menu bars in the xref:ug-vw:ROOT:about.adoc[Wicket viewer]'s UI.
+The behaviour of these services is rendered in various ways, though the most obvious is as the menu actions on the top-level menu bars in the xref:vw:ROOT::about.adoc[Wicket viewer]'s UI.
Domain services can also be used for a number of other purposes:
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
index 1d03853..df8a64f 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
@@ -8,7 +8,7 @@ End users interact with view models in the same way as a domain entity, indeed t
However, whereas domain entities are mapped to a datastore, view models are not.
Instead they are recreated dynamically by serializing their state, ultimately into the URL itself (meaning their state it is in effect implicitly managed by the client browser).
-You will notice that the URL for view models (as shown in xref:ug-vw:ROOT:about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) tends to be quite long.
+You will notice that the URL for view models (as shown in xref:vw:ROOT::about.adoc[Wicket viewer] or xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) tends to be quite long.
This capability opens up a number of more advanced use cases:
@@ -110,7 +110,7 @@ To support this use case, a view model can be defined such that it can act as a
This is done by annotating the class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding XSD schema describing the structure of that XML.
A discussion of how that might be done using an ESB such as link:http://camel.apache.org[Apache Camel(TM)] follows xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc#dtos_consumers[below].
-In case it's not obvious, these DTOs are still usable as "regular" view models; they will render in the xref:ug-vw:ROOT:about.adoc[Wicket viewer] just like any other.
+In case it's not obvious, these DTOs are still usable as "regular" view models; they will render in the xref:vw:ROOT::about.adoc[Wicket viewer] just like any other.
In fact (as the xref:ug:fun:programming-model/view-models/jaxb.adoc[programming model] section below makes clear), these JAXB-annotated view models are in many regards the most powerful of all the alternative ways of writing view models.
It's also worth noting that it is also possible to download the XML (or XSD) straight from the UI, useful during development.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
index 297c1ca..b961e66 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/cqrs.adoc
@@ -42,6 +42,6 @@ In CQRS the commands correspond to the business logic that mutates the system.
Whether this logic is part of the command class (`PlaceOrderCommand`) or whether that command delegates to methods on the domain object is an implementation detail; but it certainly is common for the business logic to be wholly within the command object and for the domain object to be merely a data holder of the data within the command/write datastore.
In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using xref:ug:fun:building-blocks/types-of-domain-objects/mixins.adoc[mixins].
-In the UI (surfaced by the xref:ug-vw:ROOT:about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
+In the UI (surfaced by the xref:vw:ROOT::about.adoc[Wicket viewer]) or in the REST API (surfaced by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index ccef8fd..ab210de 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -12,7 +12,7 @@ The views provided out of the box by these frameworks tend to be simple _CRUD_-
More sophisticated behavior is accomplished by customizing the generated controllers.
The most obvious difference when developing an Apache Isis application is its deliberate lack of an explicit controller layer; non- _CRUD_ behavior is automatically made available in its generic object-oriented __UI__s.
-More sophisticated UIs can be built either by xref:ug-vw:ROOT:extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
+More sophisticated UIs can be built either by xref:vw:ROOT::extending.adoc[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by Apache Isis' xref:ug-vro:ROOT:about.adoc[Restful Objects] viewer.
Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:http://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
index a37baa9..92e572d 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
Apache Isis is primarily aimed at custom-built "enterprise" applications.
-The UI provided by the xref:ug-vw:ROOT:about.adoc[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
+The UI provided by the xref:vw:ROOT::about.adoc[Wicket viewer] is intended to be usable by domain experts, typically end-users within the organization.
The REST API exposed by the xref:ug-vro:ROOT:about.adoc[RestfulObjects viewer] allows custom apps to be developed -- eg using Angular or similar -- for use by those requiring more guidance; typically end-users outside of the organization.
This section describes some of the core principles and values that the framework aims to honour and support.
diff --git a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
index 6fd6f83..37bf646 100644
--- a/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
+++ b/antora/components/ug/modules/fun/pages/core-concepts/principles/for-the-long-term.adoc
@@ -21,7 +21,7 @@ The diagram below illustrates this:
.decoupled applications
image::core-concepts/philosophy/decoupled-applications.png[width="800px",link="{imagesdir}/core-concepts/philosophy/decoupled-applications.png"]
-Here, the presentation layer (xref:ug-vw:ROOT:about.adoc[Wicket UI] or xref:ug-vro:ROOT:about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
+Here, the presentation layer (xref:vw:ROOT::about.adoc[Wicket UI] or xref:ug-vro:ROOT:about.adoc[REST API]) is handled by the framework, while the developer focusses on just the domain layer.
The framework encourages splitting this functionality into modules; each such module has its counterpart (typically tables within a given RDBMS database schema) within the persistence layer.
This architecture means that it's impossible for business logic to leach out into the adjacent presentation layer because the developer doesn't (can't) write any code for presentation layer.
diff --git a/antora/components/ug/modules/fun/pages/programming-model.adoc b/antora/components/ug/modules/fun/pages/programming-model.adoc
index 7a52ac5..fe856bf 100644
--- a/antora/components/ug/modules/fun/pages/programming-model.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model.adoc
@@ -58,7 +58,7 @@ If a domain service does hold state (eg the `Scratchpad` service noted above) th
The framework also defines supplementary annotations, `@DomainObjectLayout` and `@DomainServiceLayout`.
These provide hints relating to the layout of the domain object in the user interface.
-(Alternatively, these UI hints can be defined in a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file.
+(Alternatively, these UI hints can be defined in a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc b/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
index 6443e85..16b85d7 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/collections.adoc
@@ -14,7 +14,7 @@ Most collections (those that are modifiable) will also have a setter and, if per
And collections properties will also have a number of annotations:
* Apache Isis defines its own `@Collection` annotation for capturing domain semantics.
-It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file)
+It also provides a `@CollectionLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file)
* the collections of domain entities are often annotated with various JDO/DataNucleus annotations, most notably `javax.jdo.annotations.Persistent`.
This and other annotations can be used to specify if the association is bidirectional, and whether to define a link table or not to hold foreign key columns.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
index f676487..3b0ad9e 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-services/menu.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
Menu services provide actions to be rendered on the menu.
For the Wicket viewer, each service's actions appear as a collection of menu items of a named menu, and this menu is on one of the three menu bars provided by the Wicket viewer.
-Although these can be organised using annotations, it's usually easier to use a xref:ug-vw:ROOT:menubars-layout/file-based.adoc[`menubars.layout.xml`] file.
+Although these can be organised using annotations, it's usually easier to use a xref:vw:ROOT::menubars-layout/file-based.adoc[`menubars.layout.xml`] file.
For the Restful Objects viewer, all menu services are shown in the services representation.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
index 8dbf3df..277beaa 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/domain-services/organizing-services.adoc
@@ -8,11 +8,11 @@ In larger applications we have found it worthwhile to ensure that our domain ser
The application provides the `@DomainService(nature=...)` annotation that helps distinguish some of these responsibilities:
-* `VIEW` indicates that the actions should appear on the menu of the xref:ug-vw:ROOT:about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
+* `VIEW` indicates that the actions should appear on the menu of the xref:vw:ROOT::about.adoc[Wicket viewer], and as top-level actions for the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer]
* `DOMAIN` indicates that the actions are for other domain objects to invoke (either directly or indirectly through the event bus), but in any case should not be rendered at all in the UI
-* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], but not rendered by the xref:ug-vw:ROOT:about.adoc[Wicket viewer].
+* `VIEW_REST_ONLY` indicates that the actions should appear in the REST API provided by the xref:ug-vro:ROOT:about.adoc[Restful Objects viewer], but not rendered by the xref:vw:ROOT::about.adoc[Wicket viewer].
If the domain service nature is not specified (or is left to its default, `VIEW`), then the service's actions will appear in the UI.
diff --git a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
index c22bbbb..d4100b0 100644
--- a/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
+++ b/antora/components/ug/modules/fun/pages/programming-model/properties.adoc
@@ -14,7 +14,7 @@ Most properties (those that are editable/modifiable) will also have a setter and
And most properties will also have a number of annotations:
* Apache Isis defines its own set own `@Property` annotation for capturing domain semantics.
-It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:ug-vw:ROOT:layout.adoc[`.layout.xml`] file)
+It also provides a `@PropertyLayout` for UI hints (though the information in this annotation may instead be provided by a supplementary xref:vw:ROOT::layout.adoc[`.layout.xml`] file)
* the properties of domain entities are often annotated with the JDO/DataNucleus `@javax.jdo.annotations.Column` annotation.
For property references, there may be other annotations to indicate whether the reference is bidirectional.
@@ -123,7 +123,7 @@ If this is omitted then whether editing is enabled or disabled is defined global
== Ignoring Properties
-By default Apache Isis will automatically render all properties in the xref:ug-vw:ROOT:about.adoc[Wicket UI] or in the xref:ug-vro:ROOT:about.adoc[REST API].
+By default Apache Isis will automatically render all properties in the xref:vw:ROOT::about.adoc[Wicket UI] or in the xref:ug-vro:ROOT:about.adoc[REST API].
To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using `@Programmatic`.
Similarly, you can tell JDO/DataNucleus to ignore a property using the `@javax.jdo.annotations.NotPersistent` annotation.
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc b/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
index f48ac3a..6fb5a95 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/action-icons-and-css.adoc
@@ -24,7 +24,7 @@ public void renew() {
}
----
-Alternatively, you can specify these hints dynamically in the xref:ug-vw:ROOT:layout.adoc[`Xxx.layout.xml`] for the entity:
+Alternatively, you can specify these hints dynamically in the xref:vw:ROOT::layout.adoc[`Xxx.layout.xml`] for the entity:
[source,xml]
----
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc b/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
index 17590c2..ce7f93b 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/layout.adoc
@@ -7,6 +7,6 @@ The most significant aspect of the UI is the layout of the object's members: its
These can be organized into columns, rows and tabs.
This can be accomplished using either annotations or through a separate file-based layout.
-Since this is a large topic, it has its own xref:ug-vw:ROOT:layout.adoc[layout chapter] in the Wicket viewer guide.
+Since this is a large topic, it has its own xref:vw:ROOT::layout.adoc[layout chapter] in the Wicket viewer guide.
diff --git a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc b/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
index 22746dc..b77c406 100644
--- a/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
+++ b/antora/components/ug/modules/fun/pages/ui-hints/object-titles-and-icons.adoc
@@ -10,7 +10,7 @@ The icon is often the same for all instances of a particular class, but it's als
This could represent the state of that object (eg a shipped order, say, or overdue library book).
It is also possible for an object to provide a CSS class hint.
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
== Object Title
@@ -173,7 +173,7 @@ If there is no requirement to customize the icon (the normal case), then the ico
For example, the icon for a class `org.mydomain.myapp.Customer` will be `org/mydomain/myapp/Customer.png` (if it exists).
Alternatively, a font-awesome icon can be used.
-This is specified using the xref:rg:ant:DomainObjectLayout/cssClassFa.adoc[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:ug-vw:ROOT:layout/file-based.adoc[layout.xml] file.
+This is specified using the xref:rg:ant:DomainObjectLayout/cssClassFa.adoc[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:vw:ROOT::layout/file-based.adoc[layout.xml] file.
For example:
@@ -257,14 +257,14 @@ public class OrderSubscriptions extends AbstractSubscriber {
== Object CSS Styling
It is also possible for an object to return a xref:rg:cms:methods/reserved/cssClass.adoc[CSS class].
-In conjunction with xref:ug-vw:ROOT:customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
+In conjunction with xref:vw:ROOT::customisation/tweaking-css-classes.adoc[customized CSS] this can be used to apply arbitrary styling; for example each object could be rendered in a page with a different background colour.
=== Declarative style
To render an object with a particular CSS, use
-xref:rg:ant:DomainObjectLayout/cssClass.adoc[`@DomainObjectLayout#cssClass()`] or in the xref:ug-vw:ROOT:layout/file-based.adoc[layout.xml] file.
+xref:rg:ant:DomainObjectLayout/cssClass.adoc[`@DomainObjectLayout#cssClass()`] or in the xref:vw:ROOT::layout/file-based.adoc[layout.xml] file.
When the domain object is rendered on its own page, this CSS class will appear on a top-level `<div>`.
Or, when the domain object is rendered as a row in a collection, then the CSS class will appear in a `<div>` wrapped by the `<tr>` of the row.
diff --git a/antora/components/ug-vw/antora.yml b/core/viewer-wicket/_adoc/antora.yml
similarity index 59%
rename from antora/components/ug-vw/antora.yml
rename to core/viewer-wicket/_adoc/antora.yml
index 296dc5b..afe732b 100644
--- a/antora/components/ug-vw/antora.yml
+++ b/core/viewer-wicket/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: ug-vw
-title: "User Guides - Wicket Viewer"
+name: vw
+title: "Wicket Viewer"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/ug-vw/examples.csv b/core/viewer-wicket/_adoc/examples.csv
similarity index 100%
rename from antora/components/ug-vw/examples.csv
rename to core/viewer-wicket/_adoc/examples.csv
diff --git a/antora/components/ug-vw/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/examples/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/examples/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/about-page/about-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/about-page/about-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/dividers.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/dividers.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.pdn b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.pdn
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/layout-menus.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/application-menu/tertiary.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/application-menu/tertiary.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/060-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/bookmarked-pages/panel.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/brand-logo/brand-logo.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/030-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url-940.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/copy-link/050-title-url.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/modal.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/modal.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/sidebar.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/dialog-mode/sidebar.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/no-header.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/regular.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/embedded-view/regular.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/features/recent-pages/recent-pages.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/customer-order.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/customer-order.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Invoice.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Invoice.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Lease.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-Lease.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/menubars/010-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/menubars/010-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/menubars/020-download.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/menubars/020-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-0-8-0.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-4-4-12.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/6-6-0-12.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout.css b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/isis-layout.css
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-1.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-1.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-2.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/theme-chooser/example-2.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png b/core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
rename to core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
diff --git a/antora/components/ug-vw/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ug-vw/modules/ROOT/nav.adoc b/core/viewer-wicket/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/nav.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/about.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/about.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/configuration-properties.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/configuration-properties.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/about-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/about-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/about-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/auto-refresh.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/auto-refresh.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/brand-logo.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/brand-logo.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/brand-logo.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/brand-logo.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/custom-javascript.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/custom-javascript.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/request-parameters.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/request-parameters.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/request-parameters.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/request-parameters.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/top-level-index-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/top-level-index-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/using-different-css-file.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/using-different-css-file.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/welcome-page.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/welcome-page.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/customisation/welcome-page.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/custom-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/custom-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/custom-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/replacing-page-elements.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/replacing-page-elements.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/blob-attachments.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/blob-attachments.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/blob-attachments.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/bookmarked-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/bookmarked-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/hints-and-copy-url.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/hints-and-copy-url.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/recent-pages.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/recent-pages.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/recent-pages.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/titles-in-tables.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/titles-in-tables.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/titles-in-tables.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/user-registration.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/user-registration.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/user-registration.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/features/where-am-i.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/features/where-am-i.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/features/where-am-i.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/extending/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/extending/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/svg-support.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/hints-and-tips/svg-support.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/incode-platform.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/incode-platform.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/incode-platform.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/customisation/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/customisation/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/annotation-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/annotation-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/annotation-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/file-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/file-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/layout/table-columns.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/layout/table-columns.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/layout/table-columns.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/layout/table-columns.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/_attributes.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/_partials/_attributes.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/_attributes.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/annotation-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/annotation-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
diff --git a/antora/components/ug-vw/modules/ROOT/pages/menubars-layout/file-based.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from antora/components/ug-vw/modules/ROOT/pages/menubars-layout/file-based.adoc
rename to core/viewer-wicket/_adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
diff --git a/antora/components/ug-vw/sync_examples.sh b/core/viewer-wicket/_adoc/sync_examples.sh
similarity index 100%
rename from antora/components/ug-vw/sync_examples.sh
rename to core/viewer-wicket/_adoc/sync_examples.sh
diff --git a/site.yml b/site.yml
index 37043c1..d8f329a 100644
--- a/site.yml
+++ b/site.yml
@@ -21,7 +21,7 @@ content:
start_path: antora/components/ug-vro
branches: HEAD
- url: .
- start_path: antora/components/ug-vw
+ start_path: core/viewer-wicket/_adoc
branches: HEAD
- url: .
branches: HEAD