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 2022/10/25 13:22:39 UTC
[isis] 01/01: ISIS-3255 : removes gmap3 component (had not been migrated), fixes some TODOs in docs
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3255
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 620103b0758a844e5c2c53fb211e242649ebf341
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 25 14:22:01 2022 +0100
ISIS-3255 : removes gmap3 component (had not been migrated), fixes some TODOs in docs
---
README.adoc | 8 +--
.../modules/ROOT/pages/landing-page/catalogs.adoc | 2 +-
.../causeway-in-pictures.adoc | 8 +--
.../what-is-apache-causeway/screencasts-older.adoc | 10 ++--
.../pages/what-is-apache-causeway/screencasts.adoc | 16 +++---
.../hooks/CollectionLayout_021-defaultView.adoc | 2 +-
.../layout/component/CollectionLayoutData.adoc | 4 +-
.../causeway/applib/services/command/Command.java | 2 +-
.../core/config/CausewayConfiguration.java | 62 ++++++++++++++++++----
.../adoc/modules/audittrail/pages/about.adoc | 7 ++-
.../HasInteractionId_auditTrailEntries.java | 3 ++
.../Object_recentAuditTrailEntries.java | 3 ++
.../audittrail/applib/dom/AuditTrailEntry.java | 3 ++
.../applib/dom/AuditTrailEntryRepository.java | 2 +
...ntityPropertyChangeSubscriberForAuditTrail.java | 2 +
extensions/vw/gmap3/adoc/antora.yml | 19 -------
extensions/vw/gmap3/adoc/modules/gmap3/nav.adoc | 4 --
.../vw/gmap3/adoc/modules/gmap3/pages/about.adoc | 5 --
.../adoc/modules/gmap3/partials/module-nav.adoc | 3 --
extensions/vw/gmap3/pom.xml | 42 ---------------
.../pages/extending/replacing-page-elements.adoc | 5 +-
21 files changed, 99 insertions(+), 113 deletions(-)
diff --git a/README.adoc b/README.adoc
index ab0acc90ea..3deee160c7 100644
--- a/README.adoc
+++ b/README.adoc
@@ -155,11 +155,11 @@ For example, when a collection of objects is rendered, this is just one several
image::https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/070-pluggable-views.png[link="https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/070-pluggable-views.png"]
-The __gmap3__ extension will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
+// The __gmap3__ extension will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
+//
+// image::https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png[link="https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png"]
-image::https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png[link="https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png"]
-
-Similarly the __fullcalendar2__ extension will render any domain entity (such as `ToDoItem`) that implements its `Calendarable` interface:
+Thus, the __fullcalendar2__ extension will render any domain entity (such as `ToDoItem`) that implements its `Calendarable` interface:
image::https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/090-fullcalendar2-view.png[link="https://raw.githubusercontent.com/apache/causeway/master/antora/components/docs/modules/ROOT/images/what-is-apache-causeway/causeway-in-pictures/090-fullcalendar2-view.png"]
diff --git a/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc b/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
index eeccc901e7..27522a9468 100644
--- a/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
+++ b/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
@@ -18,5 +18,5 @@ They are generally not consumed directly by your application.
For example, the "Excel Download" extension allows collections to be downloaded as an Excel `.xlsx` spreadsheet in the Wicket viewer.
+
That said, some extensions do also provide an applib.
-For example the gmap3 extension provides an applib so that domain objects can expose their location (typically a Java interface to be implemented); this allows the extension to plot them on a map.
+For example the xref:vw:fullcalendar:about.adoc[fullcalendar] extension provides an applib so that domain objects can expose a date (typically a Java interface to be implemented); this allows the extension to plot them on a calendar.
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/causeway-in-pictures.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/causeway-in-pictures.adoc
index fd3d031aa6..2007c9866e 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/causeway-in-pictures.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/causeway-in-pictures.adoc
@@ -102,10 +102,10 @@ For example, when a collection of objects is rendered, this is just one of sever
image::what-is-apache-causeway/causeway-in-pictures/070-pluggable-views.png[width="800px"]
-There are a number of optional extensions provided with the framework.
-One such is the xref:vw:gmap3:about.adoc[Gmap3] extension, that will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
-
-image::what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png[width="800px"]
+// There are a number of optional extensions provided with the framework.
+// One such is the xref:vw:gmap3:about.adoc[Gmap3] extension, that will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
+//
+// image::what-is-apache-causeway/causeway-in-pictures/080-gmap3-view.png[width="800px"]
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc
index a4bd8c0f3a..f6653887ee 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc
@@ -127,11 +127,11 @@ _Using the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s excel
-|Customizing the Wicket viewer +
-
-_How to customize the Wicket viewer, integrating the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s gmap3 wicket component._
-
-|video::9o5zAME8LrM[youtube,width="420px",height="315px"]
+// |Customizing the Wicket viewer +
+//
+// _How to customize the Wicket viewer, integrating the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s gmap3 wicket component._
+//
+// |video::9o5zAME8LrM[youtube,width="420px",height="315px"]
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
index 1c082fc480..a1128fa677 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
@@ -458,7 +458,7 @@ How to use the xref:refguide:applib-methods:prefixes.adoc#autoComplete[autoCompl
-12+| *Excel, Calendars, Maps*
+12+| *Excel, Calendars*
@@ -484,15 +484,15 @@ otherwise be part of the Apache Causeway metamodel (and thus show up in the UI).
||||||||||X|
-|link:https://www.youtube.com/watch?v=mIwptdeZ67Q[050^] +
-Configuring an Apache Causeway app to allow tables of domain objects with location information to be rendered on map,
- using the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s gmap3 wicket component.
-|||||X||||||
+// |link:https://www.youtube.com/watch?v=mIwptdeZ67Q[050^] +
+// Configuring an Apache Causeway app to allow tables of domain objects with location information to be rendered on map,
+// using the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s gmap3 wicket component.
+// |||||X||||||
-|link:https://www.youtube.com/watch?v=3n_70HJ23uY[051^] +
-Using derived properties to persist value types (such as gmap3's Location value type) as regular primitive datatypes.
-|||||||X||||
+// |link:https://www.youtube.com/watch?v=3n_70HJ23uY[051^] +
+// Using derived properties to persist value types (such as gmap3's Location value type) as regular primitive datatypes.
+// |||||||X||||
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/CollectionLayout_021-defaultView.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/CollectionLayout_021-defaultView.adoc
index 2596b22cc9..1dbb5e5b43 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/CollectionLayout_021-defaultView.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/CollectionLayout_021-defaultView.adoc
@@ -24,6 +24,6 @@ public class BusRoute {
----
<.> renders the collection as a table view.
-The xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] allows additional views to be configured to render collections of objects, eg xref:vw:exceldownload:about.adoc[Excel Download] ("excel"), xref:vw:fullcalendar:about.adoc[Fullcalendar] ("fullcalendar") and xref:vw:gmap3:about.adoc[Gmap3] ("map") extensions.
+The xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] allows additional views to be configured to render collections of objects, eg xref:vw:exceldownload:about.adoc[Excel Download] ("excel") and xref:vw:fullcalendar:about.adoc[Fullcalendar] ("fullcalendar") extensions.
This attribute can be used to select any of these alternative views instead.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
index 93c2ef75c2..2cb4191d81 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
@@ -49,7 +49,7 @@ Collection identifier, being the getter method without 'get' prefix, first lette
<.> xref:#getDefaultView_[getDefaultView()]
+
--
-Typically `table` or `hidden` , but could be any other named view that is configured and appropriate, eg `gmap3` or `fullcalendar2` .
+Typically `table` or `hidden` , but could be any other named view that is configured and appropriate, eg `excel` or `fullcalendar2` .
--
<.> xref:#getOwner_[getOwner()]
+
@@ -77,7 +77,7 @@ Collection identifier, being the getter method without 'get' prefix, first lette
[#getDefaultView_]
=== getDefaultView()
-Typically `table` or `hidden` , but could be any other named view that is configured and appropriate, eg `gmap3` or `fullcalendar2` .
+Typically `table` or `hidden` , but could be any other named view that is configured and appropriate, eg `fullcalendar2` or `excel`.
[#getOwner_]
=== getOwner()
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
index d986909601..e89a0257a6 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/Command.java
@@ -71,7 +71,7 @@ import lombok.extern.log4j.Log4j2;
* {@link WrapperFactory#asyncWrapMixin(Class, Object, AsyncControl)}), then
* a separate {@link Command} object
* is created, and the originating {@link Command} is set to be its
- * {@link Command#getParent() parent}.
+ * {@link Command#getParentInteractionId() parent}.
* </p>
*
* @since 1.x {@index}
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 2cd98dc160..a0ce43610e 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -260,7 +260,6 @@ public class CausewayConfiguration {
public static class DomainObject {
/**
- * TODO[2464] semantic renaming audit/dispatch -> publishing
* The default for whether <i>domain entities</i> should be audited or not (meaning that any changes are
* sent through to {@link EntityChangesSubscriber}s and
* sent through to {@link EntityPropertyChangeSubscriber}.
@@ -743,13 +742,11 @@ public class CausewayConfiguration {
public static class Action {
/**
- * TODO[2464] semantic renaming audit/dispatch -> publishing
* The default for whether action invocations should be reified
* as a {@link org.apache.causeway.applib.services.command.Command},
* to be sent to any registered
* {@link org.apache.causeway.applib.services.publishing.spi.CommandSubscriber}s,
- * either for auditing or for replayed against a secondary
- * system, eg for regression testing.
+ * typically for auditing purposes.
*
* <p>
* This setting can be overridden on a case-by-case basis using
@@ -1400,9 +1397,11 @@ public class CausewayConfiguration {
}
/**
- * Whether to perform introspection in parallel. Meant to speed up bootstrapping.
+ * Whether to perform metamodel introspection in parallel, intended to speed up bootstrapping.
+ *
* <p>
- * For now this is <i>experimental</i>. Leave this disabled (the default).
+ * For now this is <i>experimental</i>.
+ * We recommend this is left as disabled (the default).
* </p>
*/
private boolean parallelize = false; //TODO[CAUSEWAY-2382] concurrent spec-loading is experimental
@@ -2250,7 +2249,6 @@ public class CausewayConfiguration {
*/
private boolean wicketSourcePlugin = false;
- //TODO no meta data yet ... https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-configuration-metadata.html#configuration-metadata-property-attributes
private final Application application = new Application();
@Data
public static class Application {
@@ -2873,7 +2871,21 @@ public class CausewayConfiguration {
public static class Cors {
/**
- * TODO missing java-doc
+ * Whether the resource supports user credentials.
+ *
+ * <p>
+ * This flag is exposed as part of 'Access-Control-Allow-Credentials' header in a pre-flight response.
+ * It helps browser determine whether or not an actual request can be made using credentials.
+ * </p>
+ *
+ * <p>
+ * By default this is not set (i.e. user credentials are not supported).
+ * </p>
+ *
+ * <p>
+ * For more information, check the usage of the <code>cors.support.credentials</code> init parameter
+ * for <a href="https://github.com/eBay/cors-filter">EBay CORSFilter</a>.
+ * </p>
*/
private boolean allowCredentials = false;
@@ -2881,7 +2893,12 @@ public class CausewayConfiguration {
* Which origins are allowed to make CORS requests.
*
* <p>
- * The default is the wildcard ("*") but this can be made more restrictive if necessary.
+ * The default is the wildcard ("*"), meaning any origin is allowed to access the resource,
+ * but this can be made more restrictive if necessary using a whitelist of comma separated origins
+ * eg:
+ * </p>
+ * <p>
+ * <code>http://www.w3.org, https://www.apache.org</code>
* </p>
*
* <p>
@@ -2892,7 +2909,12 @@ public class CausewayConfiguration {
private List<String> allowedOrigins = listOf("*");
/**
- * Which HTTP headers are allowed in a CORS request.
+ * Which HTTP headers can be allowed in a CORS request.
+ *
+ * <p>
+ * These header will also be returned as part of 'Access-Control-Allow-Headers' header in a
+ * pre-flight response.
+ * </p>
*
* <p>
* For more information, check the usage of the <code>cors.allowed.headers</code> init parameter
@@ -2914,6 +2936,16 @@ public class CausewayConfiguration {
* Which HTTP methods are permitted in a CORS request.
*
* <p>
+ * A comma separated list of HTTP methods that can be used to access the resource, using cross-origin
+ * requests. These are the methods which will also be included as part of 'Access-Control-Allow-Methods'
+ * header in a pre-flight response.
+ * </p>
+ *
+ * <p>
+ * Default is <code>GET</code>, <code>POST</code>, <code>HEAD</code>, <code>OPTIONS</code>.
+ * </p>
+ *
+ * <p>
* For more information, check the usage of the <code>cors.allowed.methods</code> init parameter
* for <a href="https://github.com/eBay/cors-filter">EBay CORSFilter</a>.
* </p>
@@ -2924,6 +2956,16 @@ public class CausewayConfiguration {
* Which HTTP headers are exposed in a CORS request.
*
* <p>
+ * A comma separated list of headers other than the simple response headers that browsers are allowed
+ * to access. These are the headers which will also be included as part of
+ * 'Access-Control-Expose-Headers' header in the pre-flight response.
+ * </p>
+ *
+ * <p>
+ * Default is none.
+ * </p>
+ *
+ * <p>
* For more information, check the usage of the <code>cors.exposed.headers</code> init parameter
* for <a href="https://github.com/eBay/cors-filter">EBay CORSFilter</a>.
* </p>
diff --git a/extensions/security/audittrail/adoc/modules/audittrail/pages/about.adoc b/extensions/security/audittrail/adoc/modules/audittrail/pages/about.adoc
index 7bf84fdd74..b546412de0 100644
--- a/extensions/security/audittrail/adoc/modules/audittrail/pages/about.adoc
+++ b/extensions/security/audittrail/adoc/modules/audittrail/pages/about.adoc
@@ -3,7 +3,12 @@
: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 [...]
-The xref:security:audittrail:about.adoc[] module provides an implementation of the xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber], as well as a number of related domain services,
+The xref:security:audittrail:about.adoc[] module provides an implementation of the xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber], which provides a fine-grained persistent audit trail: each and every change to a entity property is persisted as an individual `AuditTrailEntry` instance.
+The xref:refguide:extensions:index/audittrail/applib/
+
+xref:refguide:applib:index/services/iactn/Interaction.adoc#getInteractionId_[interaction id] identifies all the changes made within a single xref:refguide:applib:index/services/iactn/Interaction.adoc[interaction].
+
+It also provides as well as a number of related domain services,
It creates an audit record for each changed property of each domain entity.
WARNING: TODO: v2 - to write up...
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/HasInteractionId_auditTrailEntries.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/HasInteractionId_auditTrailEntries.java
index 3cedc4df0c..0b7a141fcc 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/HasInteractionId_auditTrailEntries.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/HasInteractionId_auditTrailEntries.java
@@ -33,6 +33,9 @@ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepos
import lombok.RequiredArgsConstructor;
+/**
+ * @since 2.0 {@index}
+ */
@Collection(
domainEvent = HasInteractionId_auditTrailEntries.CollectionDomainEvent.class
)
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
index 2f41f41233..2139e09e38 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_recentAuditTrailEntries.java
@@ -41,6 +41,9 @@ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepos
import lombok.RequiredArgsConstructor;
import lombok.val;
+/**
+ * @since 2.0 {@index}
+ */
@Action(
domainEvent = Object_recentAuditTrailEntries.ActionDomainEvent.class,
semantics = SemanticsOf.SAFE
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
index 2744c2fc00..58162c9495 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.java
@@ -52,6 +52,9 @@ import org.apache.causeway.extensions.audittrail.applib.CausewayModuleExtAuditTr
import lombok.val;
import lombok.experimental.UtilityClass;
+/**
+ * @since 2.0 {@index}
+ */
@Named(AuditTrailEntry.LOGICAL_TYPE_NAME)
@DomainObject(
editing = Editing.DISABLED,
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
index e499d9dc2d..af20723c32 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntryRepository.java
@@ -41,6 +41,8 @@ import lombok.val;
/**
* Provides supporting functionality for querying {@link AuditTrailEntry audit trail entry} entities.
+ *
+ * @since 2.0 {@index}
*/
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public abstract class AuditTrailEntryRepository<E extends AuditTrailEntry> {
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
index 5ed5d177e4..578477fca0 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/spiimpl/EntityPropertyChangeSubscriberForAuditTrail.java
@@ -42,6 +42,8 @@ import lombok.extern.log4j.Log4j2;
* Implementation of the Causeway {@link EntityPropertyChangeSubscriber} creates a log
* entry to the database (the {@link AuditTrailEntry} entity) each time a
* user either logs on or logs out, or if their session expires.
+ *
+ * @since 2.0 {@index}
*/
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/extensions/vw/gmap3/adoc/antora.yml b/extensions/vw/gmap3/adoc/antora.yml
deleted file mode 100644
index c1675fed61..0000000000
--- a/extensions/vw/gmap3/adoc/antora.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: vw
-version: latest
diff --git a/extensions/vw/gmap3/adoc/modules/gmap3/nav.adoc b/extensions/vw/gmap3/adoc/modules/gmap3/nav.adoc
deleted file mode 100644
index ebdb5577b3..0000000000
--- a/extensions/vw/gmap3/adoc/modules/gmap3/nav.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-: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::vw:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc b/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc
deleted file mode 100644
index 9834f4dc08..0000000000
--- a/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Gmap3
-
-: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 [...]
-
-WARNING: TODO: v2 - to write up...
diff --git a/extensions/vw/gmap3/adoc/modules/gmap3/partials/module-nav.adoc b/extensions/vw/gmap3/adoc/modules/gmap3/partials/module-nav.adoc
deleted file mode 100644
index 6f2b2b655b..0000000000
--- a/extensions/vw/gmap3/adoc/modules/gmap3/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-** xref:vw:gmap3:about.adoc[GMap3]
-
diff --git a/extensions/vw/gmap3/pom.xml b/extensions/vw/gmap3/pom.xml
deleted file mode 100644
index 663e42850c..0000000000
--- a/extensions/vw/gmap3/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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 agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>causeway-extensions-gmap3</artifactId>
- <name>Apache Causeway Ext - Wicket Viewer - GMap3 (parent)</name>
- <description>
- A component for Apache Causeway' Wicket viewer, providing an alternative representation of a collection within a google gmap3 map.
- </description>
- <packaging>pom</packaging>
-
- <modules>
- <module>ui</module>
- </modules>
-
-
-</project>
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
index c9c7de91f4..4e41ef103e 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
@@ -6,8 +6,7 @@
Replacing elements of the page is the most powerful general-purpose way to customize the look-n-feel of the viewer.
-Examples include the
-xref:vw:gmap3:about.adoc[Gmap3], xref:vw:fullcalendar:about.adoc[Fullcalendar], xref:vw:exceldownload:about.adoc[Excel Download] and xref:vw:pdfjs:about.adoc[pdf.js] components.
+Examples include the xref:vw:fullcalendar:about.adoc[Fullcalendar], xref:vw:exceldownload:about.adoc[Excel Download] and xref:vw:pdfjs:about.adoc[pdf.js] components.
The pages generated by Apache Causeway' Wicket viewer are built up of numerous elements, from fine-grained widgets for property/parameter fields, to much larger components that take responsibility for rendering an entire entity, or a collection of entities.
Under the covers these are all implementations of the the Apache Wicket `Component` API.
@@ -101,7 +100,7 @@ In the case of (either standalone or parented) collections, though, the viewer w
For example, out-of-the-box Apache Causeway provides a table view, a summary view (totals/sums/averages of any data), and a collapsed view.
These are selected by clicking on the toolbar by each collection.
-Additional views though could render the objects in the collection as a variety of ways; as illustrated by the xref:vw:gmap3:about.adoc[Gmap3], xref:vw:fullcalendar:about.adoc[Fullcalendar] and xref:vw:exceldownload:about.adoc[Excel Download] extensions.
+Additional views though could render the objects in the collection as a variety of ways; as illustrated by the xref:vw:pdfjs:about.adoc[pdf.js], xref:vw:fullcalendar:about.adoc[Fullcalendar] and xref:vw:exceldownload:about.adoc[Excel Download] extensions.
Wicket itself has lots of components available at its http://wicketstuff.org[wicketstuff.org] companion website; you might find some of these useful for your own customizations.