You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/12 09:38:55 UTC

[isis] branch master updated: ISIS-2033: adoc: update sys overview

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 45e1dec  ISIS-2033: adoc: update sys overview
45e1dec is described below

commit 45e1dec95be32b83cd7db8294f039d5bde25bc3e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 12 10:38:42 2021 +0100

    ISIS-2033: adoc: update sys overview
---
 .../InteractionScope.adoc}                         |  20 ++--
 .../pages/index/applib/query/NamedQuery.adoc       |   4 +-
 .../generated/pages/index/applib/query/Query.adoc  |  19 ++-
 .../pages/index/applib/query/QueryRange.adoc       |  71 ++++++++++++
 .../applib/services/xactn/TransactionService.adoc  |  14 ---
 .../applib/services/xactn/TransactionState.adoc    |   2 +
 .../index/applib/util/schema/CommonDtoUtils.adoc   |   8 +-
 .../changetracking/EntityChangeTrackerDefault.adoc |  10 +-
 .../events/TransactionAfterCompletionEvent.adoc}   |  38 +++---
 .../jdo/integration/schema/JdoSchemaService.adoc}  |  30 +++--
 .../modules/generated/pages/system-overview.adoc   | 127 ++++++++++++---------
 11 files changed, 219 insertions(+), 124 deletions(-)

diff --git a/antora/components/system/modules/generated/pages/index/applib/services/TransactionScopeListener.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/InteractionScope.adoc
similarity index 66%
rename from antora/components/system/modules/generated/pages/index/applib/services/TransactionScopeListener.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/InteractionScope.adoc
index 2e13f48..6470a24 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/TransactionScopeListener.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/InteractionScope.adoc
@@ -1,22 +1,16 @@
-= TransactionScopeListener : _interface_
+= InteractionScope : _annotation_
 :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 [...]
 
-Domain services that need to be aware of transaction boundaries can implement this interface.
+_@InteractionScope_ is a specialization of _Scope @Scope_ for a component whose lifecycle is bound to the current top-level Interaction.
+
+Specifically, _@InteractionScope_ is a *composed annotation* that acts as a shortcut for _@Scope("interaction")_ .
+
+_@InteractionScope_ may be used as a meta-annotation to create custom composed annotations.
 
 .Java Sources
 [source,java]
 ----
-interface TransactionScopeListener {
-
-  void onTransactionStarted()
-
-  void onPreCommit(PreCommitPhase preCommitPhase) // <.>
+@interface InteractionScope {
 }
 ----
 
-<.> `[teal]#*onPreCommit*#(PreCommitPhase preCommitPhase)` : `void`
-+
---
-triggered during the pre-commit phase in a transaction
---
-
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc b/antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc
index 989b71b..bc4ae7c 100644
--- a/antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc
@@ -10,9 +10,7 @@ interface NamedQuery {
 
   Map<String, Object> getParametersByName()
 
-  NamedQuery<T> withStart(long start)
-
-  NamedQuery<T> withCount(long count)
+  NamedQuery<T> withRange(QueryRange range)
 
   NamedQuery<T> withParameter(String parameterName, Object parameterValue)
 }
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
index eecaa79..d0fa882 100644
--- a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
@@ -14,19 +14,19 @@ Implementations are expected to implement the _#getStart()_ and _#getCount()_ me
 ----
 interface Query {
 
-  public static long UNLIMITED_COUNT;
-
   Class<T> getResultType() // <.>
 
   String getDescription() // <.>
 
-  long getStart() // <.>
+  QueryRange getRange() // <.>
+
+  Query<T> withRange(QueryRange range)
 
-  long getCount() // <.>
+  Query<T> withRange(long... range)
 
   Query<T> withStart(long start)
 
-  Query<T> withCount(long count)
+  Query<T> withLimit(long limit)
 
   Query<T> allInstances(final Class<T> resultType)
 
@@ -44,14 +44,9 @@ The _Class_ of the objects returned by this query.
 --
 A human-readable representation of this query and its values.
 --
-<.> `[teal]#*getStart*#()` : `long`
-+
---
-The start index into the set table
---
-<.> `[teal]#*getCount*#()` : `long`
+<.> `[teal]#*getRange*#()` : `xref:system:generated:index/applib/query/QueryRange.adoc[QueryRange]`
 +
 --
-The number of items to return, starting at _#getStart()_
+Returns a model with start index into the set table and maximal number of items to return.
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/QueryRange.adoc b/antora/components/system/modules/generated/pages/index/applib/query/QueryRange.adoc
new file mode 100644
index 0000000..bf48272
--- /dev/null
+++ b/antora/components/system/modules/generated/pages/index/applib/query/QueryRange.adoc
@@ -0,0 +1,71 @@
+= QueryRange : _interface_
+: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 [...]
+
+.Java Sources
+[source,java]
+----
+interface QueryRange {
+
+  boolean isUnconstrained()
+
+  boolean hasOffset()
+
+  boolean hasLimit()
+
+  long getStart() // <.>
+
+  long getLimit() // <.>
+
+  long getEnd() // <.>
+
+  int getStartAsInt() // <.>
+
+  int getLimitAsInt() // <.>
+
+  int getEndAsInt() // <.>
+
+  QueryRange unconstrained()
+
+  QueryRange start(long start)
+
+  QueryRange limit(long limit)
+
+  QueryRange of(long... range)
+
+  QueryRange withStart(long start)
+
+  QueryRange withLimit(long limit)
+}
+----
+
+<.> `[teal]#*getStart*#()` : `long`
++
+--
+The start index into the set table. (non-negative)
+--
+<.> `[teal]#*getLimit*#()` : `long`
++
+--
+The maximum number of items to return, starting at _#getStart()_ (non-negative)
+--
+<.> `[teal]#*getEnd*#()` : `long`
++
+--
+The end index into the set table. Overflow is ignored. (non-negative)
+--
+<.> `[teal]#*getStartAsInt*#()` : `int`
++
+--
+The start index into the set table (as java int primitive)
+--
+<.> `[teal]#*getLimitAsInt*#()` : `int`
++
+--
+The maximum number of items to return (as java int primitive) if _limit_ overflows an int, _Integer#MAX_VALUE_ is returned.
+--
+<.> `[teal]#*getEndAsInt*#()` : `int`
++
+--
+The end index into the set table. Overflow is ignored. (as java int primitive) if _end_ overflows an int, _Integer#MAX_VALUE_ is returned.
+--
+
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc
index 667370d..5f84b71 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc
@@ -15,10 +15,6 @@ interface TransactionService {
   void flushTransaction() // <.>
 
   void nextTransaction() // <.>
-
-  Result<T> executeWithinTransaction(Callable<T> callable) // <.>
-
-  Optional<Throwable> executeWithinTransaction(ThrowingRunnable runnable) // <.>
 }
 ----
 
@@ -40,14 +36,4 @@ Occasionally useful to ensure that newly persisted domain objects are flushed to
 --
 Commits the current transaction (if there is one), and begins a new one. If there is no current transaction, then is a no-op.
 --
-<.> `[teal]#*executeWithinTransaction*#<T>(Callable<T> callable)` : `xref:system:generated:index/commons/functional/Result.adoc[Result]<T>`
-+
---
-Runs given _callable_ within an existing transactional boundary, or in the absence of such a boundary creates a new one.
---
-<.> `[teal]#*executeWithinTransaction*#(ThrowingRunnable runnable)` : `Optional<Throwable>`
-+
---
-Runs given _runnable_ within an existing transactional boundary, or in the absence of such a boundary creates a new one.
---
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc
index 20ffa45..70530e2 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc
@@ -24,6 +24,8 @@ enum TransactionState {
 
   boolean isComplete() // <.>
 
+  boolean isInProgress()
+
   boolean mustAbort()
 }
 ----
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc b/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
index e51f856..57eec54 100644
--- a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
@@ -14,9 +14,11 @@ class CommonDtoUtils {
 
   ValueType asValueType(final Class<?> type)
 
-  ValueDto newValueDto(final ValueType valueType, final Object val, final BookmarkService bookmarkService)
+  ValueDto newValueDto(final ValueType valueType, final Object value, final BookmarkService bookmarkService)
 
-  T setValueOn(final T valueWithTypeDto, final ValueType valueType, final Object val, final BookmarkService bookmarkService)
+  T setValueOn(final T valueWithTypeDto, final ValueType valueType, final Object value, final BookmarkService bookmarkService)
+
+  T setValueOnNonScalar(final T valueWithTypeDto, final ValueType elementValueType, final Object value, final BookmarkService bookmarkService)
 
   T setValueOn(final T valueDto, final ValueType valueType, final Object pojo, final BookmarkService bookmarkService)
 
@@ -28,6 +30,8 @@ class CommonDtoUtils {
 
   ParamDto newParamDto(final String parameterName, final Class<?> parameterType, final Object arg, final BookmarkService bookmarkService)
 
+  ParamDto newParamDtoNonScalar(final String parameterName, final Class<?> parameterElementType, final Object arg, final BookmarkService bookmarkService)
+
   T getValue(final ParamDto paramDto)
 
   String getMapValue(final MapDto mapDto, final String key)
diff --git a/antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc b/antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc
index d19e938..67c77a6 100644
--- a/antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc
+++ b/antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc
@@ -6,7 +6,7 @@
 ----
 class EntityChangeTrackerDefault {
 
-  void onPreCommit(PreCommitPhase preCommitPhase) // <.>
+  void onPreCommit(TransactionBeforeCompletionEvent event) // <.>
 
   EntityChanges getEntityChanges(final java.sql.Timestamp timestamp, final String userName)
 
@@ -32,11 +32,13 @@ class EntityChangeTrackerDefault {
 
   void recognizeUpdating(ManagedObject entity)
 
-  void incrementLoaded()
-
   Stream<EntityPropertyChange> streamPropertyChanges(final java.sql.Timestamp timestamp, final String userName, final TransactionId txId)
 }
 ----
 
-<.> `[teal]#*onPreCommit*#(PreCommitPhase preCommitPhase)` : `void`
+<.> `[teal]#*onPreCommit*#(TransactionBeforeCompletionEvent event)` : `void`
++
+--
+TRANSACTION END BOUNDARY
+--
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/Transaction.adoc b/antora/components/system/modules/generated/pages/index/core/transaction/events/TransactionAfterCompletionEvent.adoc
similarity index 60%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/Transaction.adoc
rename to antora/components/system/modules/generated/pages/index/core/transaction/events/TransactionAfterCompletionEvent.adoc
index 1c54f2f..2fe00f3 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/xactn/Transaction.adoc
+++ b/antora/components/system/modules/generated/pages/index/core/transaction/events/TransactionAfterCompletionEvent.adoc
@@ -1,28 +1,40 @@
-= Transaction : _interface_
+= TransactionAfterCompletionEvent : _enum_
 :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 [...]
 
-Representation of the current transaction, which conceptually wraps the underlying transaction context's transaction.
-
 .Java Sources
 [source,java]
 ----
-interface Transaction {
+enum TransactionAfterCompletionEvent {
+
+  COMMITTED // <.>
+
+  ROLLED_BACK // <.>
+
+  UNKNOWN // <.>
 
-  TransactionId getId()
+  TransactionAfterCompletionEvent forStatus(int status)
 
-  void flush() // <.>
+  boolean isCommitted()
 
-  TransactionState getTransactionState()
+  boolean isRolledBack()
+
+  boolean isUnknown()
 }
 ----
 
-<.> `[teal]#*flush*#()` : `void`
+<.> `[teal]#*_COMMITTED_*#`
 +
 --
-Flush all changes to the object store.
-
-Occasionally useful to ensure that newly persisted domain objects are flushed to the database prior to a subsequent repository query.
-
-Equivalent to _TransactionService#flushTransaction()_ .
+Completion status in case of proper commit.
+--
+<.> `[teal]#*_ROLLED_BACK_*#`
++
+--
+Completion status in case of proper rollback.
+--
+<.> `[teal]#*_UNKNOWN_*#`
++
+--
+Completion status in case of heuristic mixed completion or system errors.
 --
 
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/IsisInteractionScope.adoc b/antora/components/system/modules/generated/pages/index/persistence/jdo/integration/schema/JdoSchemaService.adoc
similarity index 59%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/IsisInteractionScope.adoc
rename to antora/components/system/modules/generated/pages/index/persistence/jdo/integration/schema/JdoSchemaService.adoc
index c9644f5..75e4f54 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/IsisInteractionScope.adoc
+++ b/antora/components/system/modules/generated/pages/index/persistence/jdo/integration/schema/JdoSchemaService.adoc
@@ -1,16 +1,32 @@
-= IsisInteractionScope : _annotation_
+= JdoSchemaService : _class_
 :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 [...]
 
-_@IsisInteractionScope_ is a specialization of _Scope @Scope_ for a component whose lifecycle is bound to the current top-level IsisInteraction.
-
-Specifically, _@IsisInteractionScope_ is a *composed annotation* that acts as a shortcut for _@Scope("isis-interaction")_ .
-
-_@IsisInteractionScope_ may be used as a meta-annotation to create custom composed annotations.
+Hooks into the application's lifecycle and runs database schema creation logic as soon as the meta-model was populated.
 
 .Java Sources
 [source,java]
 ----
-@interface IsisInteractionScope {
+class JdoSchemaService {
+
+  @Inject
+MetaModelContext metaModelContext;
+
+  @Inject
+TransactionAwarePersistenceManagerFactoryProxy txAwarePmfProxy;
+
+  @Named("jdo-platform-transaction-manager")
+@Inject
+PlatformTransactionManager txManager;
+
+  @Inject
+IsisBeanTypeRegistry isisBeanTypeRegistry;
+
+  @Inject
+DnSettings dnSettings;
+
+  void init()
+
+  void onAppLifecycleEvent(AppLifecycleEvent event)
 }
 ----
 
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/system/modules/generated/pages/system-overview.adoc
index 9a59424..9053f87 100644
--- a/antora/components/system/modules/generated/pages/system-overview.adoc
+++ b/antora/components/system/modules/generated/pages/system-overview.adoc
@@ -52,7 +52,7 @@ package "Base\n[Software System]" {
 .Projects/Modules (Base)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis (Aggregator)
 [source,yaml]
@@ -62,7 +62,7 @@ Artifact: isis-all
 Type: pom
 Folder: /
 ----
-|Convenience aggregator POM that references all modules, some explicitely,
+|Convenience aggregator POM that references all modules, some explicitely, 
         others via profiles, that are not activiated per default.
         The parent POM of the core framework is isis-parent/pom.xml.
 
@@ -94,9 +94,9 @@ Artifact: supplemental-model
 Type: jar
 Folder: \supplemental-model
 ----
-|For example, the templates used by many Apache distributions assemble a listing of project dependencies
-  	according to their organization name (and URL), along with the URL each project's website. When dependency
-  	POMs are missing this information, the dependency notice file that the Remote Resources Plugin renders can
+|For example, the templates used by many Apache distributions assemble a listing of project dependencies 
+  	according to their organization name (and URL), along with the URL each project's website. When dependency 
+  	POMs are missing this information, the dependency notice file that the Remote Resources Plugin renders can 
   	be invalid.
 	To compensate for incomplete dependency POMs, we use the supplemental models support.
 |===
@@ -130,7 +130,7 @@ package "Commons\n[Software System]" {
 .Projects/Modules (Commons)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Commons
 [source,yaml]
@@ -283,7 +283,7 @@ package "Core\n[Software System]" {
 .Projects/Modules (Core)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Core
 [source,yaml]
@@ -335,7 +335,7 @@ _Dependencies_
 
 _Document Index Entries_
 
-xref:system:generated:index/applib/AbstractViewModel.adoc[AbstractViewModel], xref:system:generated:index/applib/ApplicationException.adoc[ApplicationException], xref:system:generated:index/applib/FatalException.adoc[FatalException], xref:system:generated:index/applib/Identifier.adoc[Identifier], xref:system:generated:index/applib/NonRecoverableException.adoc[NonRecoverableException], xref:system:generated:index/applib/PersistFailedException.adoc[PersistFailedException], xref:system:gene [...]
+xref:system:generated:index/applib/AbstractViewModel.adoc[AbstractViewModel], xref:system:generated:index/applib/ApplicationException.adoc[ApplicationException], xref:system:generated:index/applib/FatalException.adoc[FatalException], xref:system:generated:index/applib/Identifier.adoc[Identifier], xref:system:generated:index/applib/NonRecoverableException.adoc[NonRecoverableException], xref:system:generated:index/applib/PersistFailedException.adoc[PersistFailedException], xref:system:gene [...]
 
 |Apache Isis Core - Code Gen (ByteBuddy)
 [source,yaml]
@@ -597,7 +597,7 @@ Artifact: isis-core-transaction
 Type: jar
 Folder: \core\transaction
 ----
-|Provides transaction integration with Spring and also
+|Provides transaction integration with Spring and also 
     	entity change tracking, with associated publishing and pre/post value events.
 
 _Components_
@@ -612,7 +612,7 @@ _Dependencies_
 
 _Document Index Entries_
 
-xref:system:generated:index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc[EntityChangeTrackerDefault]
+xref:system:generated:index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc[EntityChangeTrackerDefault], xref:system:generated:index/core/transaction/events/TransactionAfterCompletionEvent.adoc[TransactionAfterCompletionEvent]
 
 |Apache Isis Core - WebApp
 [source,yaml]
@@ -652,9 +652,9 @@ Type: pom
 Folder: \core\jdk-supplemental
 ----
 |Defines a module to bring in dependencies that were part of JDK 8 but
-        had been removed with later JDK versions.
-
-        Will be removed once the framework migrates to Java 11 as the required
+        had been removed with later JDK versions. 
+        
+        Will be removed once the framework migrates to Java 11 as the required 
         minimum version.
 
 _Dependencies_
@@ -714,7 +714,7 @@ package "App\n[Software System]" {
 .Projects/Modules (App)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Starter Parent
 [source,yaml]
@@ -806,7 +806,7 @@ package "Mavendeps\n[Software System]" {
 .Projects/Modules (Mavendeps)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Maven Deps
 [source,yaml]
@@ -859,7 +859,7 @@ Type: pom
 Folder: \mavendeps\jdk11
 ----
 |Defines a module to bring in dependencies that were part of JDK 8 but
-        had been removed with JDK 11+. These dependencies are activated when the
+        had been removed with JDK 11+. These dependencies are activated when the 
         consuming project is built with JDK 11 or higher.
 
 |Apache Isis Maven Deps - JDO
@@ -870,7 +870,7 @@ Artifact: isis-mavendeps-jdo
 Type: pom
 Folder: \mavendeps\jdo
 ----
-|Defines a module that provides the default JDO persistence layer integration
+|Defines a module that provides the default JDO persistence layer integration 
         for running an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
 
 _Dependencies_
@@ -887,7 +887,7 @@ Artifact: isis-mavendeps-jpa
 Type: pom
 Folder: \mavendeps\jpa
 ----
-|Defines a module that provides the default JPA persistence layer integration
+|Defines a module that provides the default JPA persistence layer integration 
         for running an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
 
 _Dependencies_
@@ -920,9 +920,9 @@ Artifact: isis-mavendeps-webapp
 Type: pom
 Folder: \mavendeps\webapp
 ----
-|Defines a module that can be almost used as a single dependency for running
+|Defines a module that can be almost used as a single dependency for running 
         an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
-
+        
         Note: Also requires a persistence provider.
 
 _Dependencies_
@@ -1005,7 +1005,7 @@ package "Mappings\n[Software System]" {
 .Projects/Modules (Mappings)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Mappings
 [source,yaml]
@@ -1188,7 +1188,7 @@ package "Persistence\n[Software System]" {
 .Projects/Modules (Persistence)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Persistence - JDO
 [source,yaml]
@@ -1276,6 +1276,11 @@ _Dependencies_
 * org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
 * org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed>
 * org.apache.isis.persistence:isis-persistence-jdo-metamodel:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-spring:jar:<managed>
+
+_Document Index Entries_
+
+xref:system:generated:index/persistence/jdo/integration/schema/JdoSchemaService.adoc[JdoSchemaService]
 
 |Apache Isis Persistence - JDO (lightweight integration)
 [source,yaml]
@@ -1336,6 +1341,7 @@ Folder: \persistence\jdo\provider
 
 _Dependencies_
 
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
 * org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
 
 |Apache Isis Persistence - JDO (Spring)
@@ -1467,7 +1473,7 @@ package "Security\n[Software System]" {
 .Projects/Modules (Security)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Security - Bypass
 [source,yaml]
@@ -1551,12 +1557,12 @@ skinparam {
   maxMessageSize 100
 }
 hide stereotype
-skinparam rectangle<<11>> {
+skinparam rectangle<<22>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<22>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -1646,12 +1652,12 @@ skinparam rectangle<<20>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -1703,7 +1709,7 @@ package "Valuetypes\n[Software System]" {
 .Projects/Modules (Valuetypes)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Value types
 [source,yaml]
@@ -2109,7 +2115,7 @@ package "Viewer\n[Software System]" {
 .Projects/Modules (Viewer)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Viewer - Common Model
 [source,yaml]
@@ -2497,7 +2503,7 @@ package "Testing\n[Software System]" {
 .Projects/Modules (Testing)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Testing
 [source,yaml]
@@ -2785,7 +2791,7 @@ package "Regression Tests\n[Software System]" {
 .Projects/Modules (Regression Tests)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis - Regression Tests
 [source,yaml]
@@ -3083,7 +3089,7 @@ package "Extensions\n[Software System]" {
 .Projects/Modules (Extensions)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Extensions
 [source,yaml]
@@ -3561,22 +3567,22 @@ skinparam {
   maxMessageSize 100
 }
 hide stereotype
-skinparam rectangle<<11>> {
+skinparam rectangle<<22>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<22>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -3721,7 +3727,7 @@ package "Subdomains\n[Software System]" {
 .Projects/Modules (Subdomains)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Subdomains
 [source,yaml]
@@ -4099,7 +4105,7 @@ package "Tooling\n[Software System]" {
 .Projects/Modules (Tooling)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis - Tooling
 [source,yaml]
@@ -4109,7 +4115,7 @@ Artifact: isis-tooling
 Type: pom
 Folder: \tooling
 ----
-|Libraries and tools not depending on the _Apache Isis Core_ ecosystem,
+|Libraries and tools not depending on the _Apache Isis Core_ ecosystem, 
         eg. code mining, automated documentation.
         (Targeted for JVM 11+)
 
@@ -4132,8 +4138,8 @@ Artifact: isis-tooling-c4modeling
 Type: jar
 Folder: \tooling\c4modeling
 ----
-|Library for programmatic C4 Model generation.
-
+|Library for programmatic C4 Model generation. 
+        
         See https://c4model.com/
 
 _Dependencies_
@@ -4203,13 +4209,13 @@ Artifact: isis-tooling-model4adoc
 Type: jar
 Folder: \tooling\model4adoc
 ----
-|Library for programmatic AsciiDoc generation.
-
+|Library for programmatic AsciiDoc generation. 
+        
         The AsciiDoc name is trademarked by the Eclipse Foundation (https://www.eclipse.org/).
-		This project is *not* part of the specification effort for _AsciiDoc_ under the
+		This project is *not* part of the specification effort for _AsciiDoc_ under the 
 		AsciiDoc Working Group. See https://projects.eclipse.org/proposals/asciidoc-language
-		and https://accounts.eclipse.org/mailing-list/asciidoc-wg. However, we are happy to
-		help with transfer of source code, if any project (under the umbrella of the
+		and https://accounts.eclipse.org/mailing-list/asciidoc-wg. However, we are happy to 
+		help with transfer of source code, if any project (under the umbrella of the 
 		AsciiDoc Working Group) is willing to take over.
 
 _Dependencies_
@@ -4298,7 +4304,7 @@ package "Examples\n[Software System]" {
 .Projects/Modules (Examples)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Demo - Parent
 [source,yaml]
@@ -4336,6 +4342,7 @@ Folder: \examples\demo\domain
 ----
 |_Components_
 
+* demoapp.dom.AppConfiguration
 * demoapp.dom._infra.DefaultTitleProvider
 * demoapp.dom._infra.LibraryPreloadingService
 * demoapp.dom._infra.fixtures.DemoFixtureScriptSpecificationProvider
@@ -4359,6 +4366,8 @@ Folder: \examples\demo\domain
 * demoapp.dom.annotDomain.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoSeedService
 * demoapp.dom.annotDomain.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities
 * demoapp.dom.annotDomain.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoSeedService
+* demoapp.dom.annotDomain.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities
+* demoapp.dom.annotDomain.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService
 * demoapp.dom.annotDomain.Property.commandPublishing.PropertyCommandPublishingJdoEntities
 * demoapp.dom.annotDomain.Property.commandPublishing.PropertyCommandPublishingJdoSeedService
 * demoapp.dom.annotDomain.Property.executionPublishing.PropertyExecutionPublishingJdoEntities
@@ -4373,13 +4382,14 @@ Folder: \examples\demo\domain
 * demoapp.dom.misc.error.service.DemoErrorReportingService
 * demoapp.dom.misc.events.DemoEventSubscriber
 * demoapp.dom.misc.events.EventLogRepository
-* demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo
-* demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities
-* demoapp.dom.services.extensions.secman.apptenancy.entities.seed.TenantedJdoSeedService
 * demoapp.dom.misc.experimental.jee.DemoRequestScopedBean
 * demoapp.dom.misc.experimental.jee.JeeDemoService
+* demoapp.dom.misc.experimental.tuple.NumberConstantRepository
 * demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoEntities
 * demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoSeedService
+* demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo
+* demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities
+* demoapp.dom.services.extensions.secman.apptenancy.entities.seed.TenantedJdoSeedService
 * demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities
 * demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoSeedService
 * demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples
@@ -4493,9 +4503,7 @@ Folder: \examples\demo\domain
 * demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoSeedService
 * demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities
 * demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoSeedService
-* demoapp.dom.misc.experimental.tuple.NumberConstantRepository
-* demoapp.dom.annotDomain.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities
-* demoapp.dom.annotDomain.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService
+* demoapp.dom.ui.custom.geocoding.GeoapifyClient
 
 _Dependencies_
 
@@ -4512,6 +4520,7 @@ _Dependencies_
 * org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
 * org.assertj:assertj-core:jar:<managed>
 * org.projectlombok:lombok:jar:<managed>
+* org.springframework.boot:spring-boot-configuration-processor:jar:<managed>
 
 |Demo - JavaFX
 [source,yaml]
@@ -4588,7 +4597,11 @@ Artifact: demo-wicket
 Type: jar
 Folder: \examples\demo\wicket
 ----
-|_Dependencies_
+|_Components_
+
+* demoapp.webapp.wicket.ui.custom.WhereInTheWorldPanelFactory
+
+_Dependencies_
 
 * org.apache.isis.examples.apps:demo-web:jar:${project.version}
 * org.apache.isis.extensions:isis-extensions-pdfjs-ui:jar:<managed>
@@ -4596,6 +4609,8 @@ Folder: \examples\demo\wicket
 * org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-wkt:jar:<managed>
 * org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed>
 * org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:2.0.0-SNAPSHOT
+* org.apache.isis.viewer:isis-viewer-wicket-viewer:jar:2.0.0-SNAPSHOT
 |===
 
 == Incubator
@@ -4689,7 +4704,7 @@ package "Incubator\n[Software System]" {
 .Projects/Modules (Incubator)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Incubator
 [source,yaml]
@@ -4923,7 +4938,7 @@ package "Legacy\n[Software System]" {
 .Projects/Modules (Legacy)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description
+|Coordinates |Description 
 
 |Apache Isis Legacy
 [source,yaml]