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/01/04 13:13:26 UTC
[isis] 04/11: ISIS-1811: updates docs for 2.0.0-M1 (or adds TODOs)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ebdbfe7ecb3f35f314e242744279612e80da7367
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 10:27:45 2019 +0000
ISIS-1811: updates docs for 2.0.0-M1 (or adds TODOs)
---
.../guides/rgant/_rgant-Action_domainEvent.adoc | 2 +-
.../asciidoc/guides/rgant/_rgant-DomainObject.adoc | 4 ++--
...nded.adoc => _rgant-DomainObject_bounding.adoc} | 8 +++----
.../_rgant-DomainObject_collectionDomainEvent.adoc | 2 +-
.../_rgant-DomainObject_propertyDomainEvent.adoc | 2 +-
.../guides/rgcfg/_rgcfg_deployment-types.adoc | 17 ++------------
.../guides/rgcfg/_rgcfg_specifying-components.adoc | 2 +-
.../rgsvc/_rgsvc_integration-api_EmailService.adoc | 2 +-
...esentation-layer-spi_ContentMappingService.adoc | 4 ++--
.../ugfun/_ugfun_drop-downs-and-defaults.adoc | 2 +-
...ugfun_getting-started_helloworld-archetype.adoc | 2 +-
..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
.../ugvw/_ugvw_configuration-properties.adoc | 12 ++++++++++
.../guides/ugvw/_ugvw_features_where-am-i.adoc | 27 ++++++++++++++++------
...ion-notes_1.16.0-to-2.0.0-M1_other-changes.adoc | 8 +++++--
.../asciidoc/pages/screencasts/screencasts.adoc | 2 +-
.../src/main/asciidoc/pages/tg/tg.adoc | 2 +-
migration-notes.adoc | 18 +++++++++++++++
18 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
index b91e65f..e7b7143 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
@@ -157,7 +157,7 @@ For this use, the default action domain event can be annotated using `@DomainObj
)
public class ToDoItem {
public static class ActionDomainEventDefault
- extends org.apache.isis.applib.services.eventbus.ActionDomainEvent<Object> { }
+ extends org.apache.isis.applib.events.domain.ActionDomainEvent<Object> { }
...
public void updateDescription(final String description) {
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
index e295588..9091b5c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
@@ -37,7 +37,7 @@ xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerSer
|override the method name to use on the auto-complete repository
-|xref:../rgant/rgant.adoc#_rgant-DomainObject_bounded[`bounded()`]
+|xref:../rgant/rgant.adoc#_rgant-DomainObject_bounding[`bounding()`]
|`true`, `false` +
(`false`)
|Whether the number of instances of this domain class is relatively small (a "bounded" set), such that instances could be selected from a drop-down list box or similar.
@@ -133,7 +133,7 @@ public class Customer {
include::_rgant-DomainObject_auditing.adoc[leveloffset=+1]
include::_rgant-DomainObject_autoCompleteRepository.adoc[leveloffset=+1]
-include::_rgant-DomainObject_bounded.adoc[leveloffset=+1]
+include::_rgant-DomainObject_bounding.adoc[leveloffset=+1]
include::_rgant-DomainObject_createdLifecycleEvent.adoc[leveloffset=+1]
include::_rgant-DomainObject_editing.adoc[leveloffset=+1]
include::_rgant-DomainObject_loadedLifecycleEvent.adoc[leveloffset=+1]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounding.adoc
similarity index 94%
rename from adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
rename to adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounding.adoc
index e2d9658..2ea2abc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounding.adoc
@@ -1,5 +1,5 @@
-[[_rgant-DomainObject_bounded]]
-= `bounded()`
+[[_rgant-DomainObject_bounding]]
+= `bounding()`
: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 [...]
:_basedir: ../../
:_imagesdir: images/
@@ -10,7 +10,7 @@ Some domain classes are immutable to the user, and moreover have only a fixed nu
Often these are "reference" ("standing") data, or lookup data/pick lists.
Typical examples could include categories, countries, states, and tax or interest rate tables.
-Where the number of instances is relatively small, ie bounded, then the `bounded()` attribute can be used as a hint.
+Where the number of instances is relatively small, ie bounded, then the `bounding()` attribute can be used as a hint.
For such domain objects the framework will automatically allow instances to be selected; xref:../ugvw/ugvw.adoc#[Wicket viewer] displays these as a drop-down list.
@@ -19,7 +19,7 @@ For example:
[source,java]
----
@DomainObject(
- bounded=true,
+ bounding=Bounding.BOUNDED,
editing=Editing.DISABLED // <1>
)
public class Currency {
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_collectionDomainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_collectionDomainEvent.adoc
index 22b39bf..701e95e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_collectionDomainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_collectionDomainEvent.adoc
@@ -18,7 +18,7 @@ For example:
)
public class ToDoItem {
public static class CollectionDomainEventDefault
- extends org.apache.isis.applib.services.eventbus.CollectionDomainEvent<Object> { }
+ extends org.apache.isis.applib.events.domain.CollectionDomainEvent<Object> { }
...
@Getter @Setter
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_propertyDomainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_propertyDomainEvent.adoc
index 4784dfb..fe49620 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_propertyDomainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_propertyDomainEvent.adoc
@@ -18,7 +18,7 @@ For example:
)
public class ToDoItem {
public static class PropertyDomainEventDefault
- extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<Object> { }
+ extends org.apache.isis.applib.events.domain.PropertyDomainEvent<Object> { }
...
@Getter @Setter
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
index 2db6671..25b916d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-TODO: 2.0: This is out of date. Instead we set system property or environment vars, as per `IsisSystemEnvironment`. This is also pluggable.
+TODO: v2: This is out of date. Instead we set system property or environment vars, as per `IsisSystemEnvironment`. This is also pluggable.
Apache Isis distinguishes between the application being run in development mode vs running in production mode. The framework calls this the "deployment type" (corresponding internally to the `DeploymentType` class).
@@ -98,18 +98,5 @@ In this case the deployment type is specified through an Apache Isis-specific co
== Overriding the deployment type
-TODO: 2.0: see env var or system properties, as per `IsisSystemEnvironment`.
-
-If bootstrapping the application using Apache Isis' xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_cmd-line[`org.apache.isis.WebServer`] then it is possible to override the deployment type using the `-t` (or `--type`) flag.
-
-For example:
-
-[source,bash]
-----
-java -jar ... org.apache.isis.WebServer -t SERVER
-----
-
-where "..." is the (usually rather long) list of JAR files and class directories that will make up your application.
-
-This works for both the xref:../ugvw/ugvw.adoc#[Wicket viewer] and the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer].
+TODO: v2: see env var or system properties, as per `IsisSystemEnvironment`.
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
index e9400b7..6e36004 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
@@ -11,7 +11,7 @@ Bootstrapping an Apache Isis application involves identifying both:
* the major components (authentication, persistence mechanisms, viewers) of Apache Isis, and also
* specifying the domain services and persistent entities that make up the application itself.
-The recommended approach is to use an xref:../rgcms/rgcms.adoc#_rgcms_classes_super_AppManifest[`AppManifest`], specified either programmatically or through the configuration properties.
+This is done using an xref:../rgcms/rgcms.adoc#_rgcms_classes_super_AppManifest[`AppManifest`], specified either programmatically or through the configuration properties.
This allows the components, services and entities to be specified from a single class.
To specify the `AppManifest` as a configuration property, use:
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_EmailService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_EmailService.adoc
index 3e7e9ae..04670c2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_EmailService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_EmailService.adoc
@@ -179,7 +179,7 @@ and these properties may optionally be configured (each has a default to use gma
These configuration properties can be specified either in `isis.properties` or in an xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_externalized-configuration[external configuration file], or programmatically using the xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`].
-TODO-v2: confirm this is the case.
+TODO: v2: confirm this is the case.
Configuration properties can also be specified as system properties.
For example, if you create a test email account on gmail, you can configure the service using:
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ContentMappingService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ContentMappingService.adoc
index 348bd99..29fd4af 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ContentMappingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_ContentMappingService.adoc
@@ -51,8 +51,8 @@ One implementation that does this is the (non-ASF) link:http://platform.incode.o
For framework implementations of `ContentMappingService` allow domain service actions that return ``CommandDto``s (either singularly or in a list) to be converted into XML documents:
-* `o.a.i.applib.conmap.ContentMappingServiceForCommandDto` will map any single instnce of a `CommandWithDto` into a `CommandDto` XML document
-* `o.a.i.applib.conmap.ContentMappingServiceForCommandsDto` will map list of ``CommandWithDto``s into a `CommandsDto` XML document, and will wrap any single instance of a `CommandWithDto` into a singleton list and thence into a `CommandsDto` XML document.
+* `o.a.i.applib.services.conmap.ContentMappingServiceForCommandDto` will map any single instance of a `CommandWithDto` into a `CommandDto` XML document
+* `o.a.i.applib.services.conmap.ContentMappingServiceForCommandsDto` will map list of ``CommandWithDto``s into a `CommandsDto` XML document, and will wrap any single instance of a `CommandWithDto` into a singleton list and thence into a `CommandsDto` XML document.
If the action invocation or property edit represent provides an implementation of a `CommandDtoProcessor` (by way of xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#commandDtoProcessor()`] or xref:../rgant/rgant.adoc#_rgant-Property_command[`@Property#commandDtoProcessor()`]) then this is also called to post-process the persisted `CommandDto` if required.
A typical use case for this is to dynamically add in serialized ``Blob``s or ``Clob``s, the values of which are not captured by default in `CommandDto`.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_drop-downs-and-defaults.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_drop-downs-and-defaults.adoc
index 6b2fef1..b53a582 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_drop-downs-and-defaults.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_drop-downs-and-defaults.adoc
@@ -111,7 +111,7 @@ For example:
public class Product { ... }
----
-For more on this, see xref:../rgant/rgant.adoc#_rgant-DomainObject_bounded[`@DomainObject#bounded()`].
+For more on this, see xref:../rgant/rgant.adoc#_rgant-DomainObject_bounding[`@DomainObject#bounding()`].
Or, if the data type is an enum, then a drop-down will be provided automatically.
A payment method is a good example of this:
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_helloworld-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_helloworld-archetype.adoc
index 7b0b0b1..f366c3b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_helloworld-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_helloworld-archetype.adoc
@@ -358,7 +358,7 @@ This can also be combined with `datanucleus:enhance` to ensure that the xref:../
Here's what the setup looks like in IntelliJ IDEA:
-TODO-v2: update this images; should basically show `mvn datanucleus:enhance jetty:run -o`
+TODO: v2: update this images; should basically show `mvn datanucleus:enhance jetty:run -o`
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
index af5ce22..ede5d35 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -620,7 +620,7 @@ It is important though to ensure that the xref:../dg/dg.adoc#_dg_hints-and-tips_
Here's what the setup looks like in IntelliJ IDEA:
-TODO-v2: update these images. Basically need to run "mvn datanucleus:enhance" as a pre-goal in the module-simple module, then "mvn jetty:run" in the webapp module.
+TODO: v2: update these images. Basically need to run "mvn datanucleus:enhance" as a pre-goal in the module-simple module, then "mvn jetty:run" in the webapp module.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index b00dff5..3953121 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -599,6 +599,12 @@ These configuration properties enable or disable the mechanisms for locating pre
(_default value_)
|Description
+|`isis.viewer.whereAmI.` +
+`maxParentChainLength`
+| +ve int +
+(`_64_`)
+| The number of levels to show in the "Where am I" chain.
+
|`isis.viewer.wicket.` +
`bookmarkedPages.maxSize`
| +ve int +
@@ -862,6 +868,12 @@ These configuration properties are used to enable/disable features that are eith
(_default value_)
|Description
+|`isis.viewer.whereAmI.enabled`
+| `true`,`false` +
+(`_true_`)
+| To disable the xref:ugvw.adoc#_ugvw_features_where-am-i["Where am I"] feature.
+
+
|`isis.viewer.wicket.` +
`disableDependent` +
`ChoiceAutoSelection`
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_where-am-i.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_where-am-i.adoc
index d633841..2c58e33 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_where-am-i.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_where-am-i.adoc
@@ -8,7 +8,10 @@
The Wicket viewer provides a secondary navigation scheme that allows users to quickly access domain objects, that are organized in a hierarchical manner.
-This hierarchy can be understood as a navigable tree-structure, where the navigable tree-nodes are either domain objects or domain views. Domain objects that take part in such a navigable-tree-structure need to declare their actual navigable parent within this hierarchy. That's all the framework needs, in order to build a navigable-tree. With version 2.0 we introduced the `Navigable` enum to use with the `@PropertyLayout` annotation to allow declarative specification of a domain object's [...]
+This hierarchy can be understood as a navigable tree-structure, where the navigable tree-nodes are either domain objects or domain views.
+Domain objects that take part in such a navigable-tree-structure need to declare their actual navigable parent within this hierarchy.
+That's all the framework needs, in order to build a navigable-tree.
+With version 2.0 we introduced the `Navigable` enum to use with the `@PropertyLayout` annotation to allow declarative specification of a domain object's navigable parent.
In other words: a domain object or view may declare it's parent (with respect to the navigable tree-structure it is part of) via use of a `@PropertyLayout(navigable=Navigable.PARENT)` annotation.
@@ -56,17 +59,26 @@ Company > Employee > PhoneNumber
=== How to use Navigable.PARENT
-. Any use of `@PropertyLayout(navigable=Navigable.PARENT)` with Java interfaces is simply ignored. These do not contribute to the domain meta model.
+. Any use of `@PropertyLayout(navigable=Navigable.PARENT)` with Java interfaces is simply ignored.
+These do not contribute to the domain meta model.
+
. Any class (abstract or concrete) may at most have one `@PropertyLayout` annotation, having `navigable=Navigable.PARENT` 'flag' set (on either a method or a field); otherwise meta-model validation will fail.
+
. The annotated member (method or field), when ...
-.. ... a method: then must be a no-arg method returning a non-primitive type (e.g. a getter)
-.. ... a field: then the field must be of non-primitive type and must also have a getter (as specified by the Java Beans Standard, particularly to allow `@PropertyLayout(navigable=Navigable.PARENT)` annotations on fields that use the lombok @Getter annotation)
-. Starting from the current domain-object, we search the object's class inheritance hierarchy (super class, super super class, ...), until we find the first class that has a `@PropertyLayout(navigable=Navigable.PARENT)` annotation. That's the one we use to resolve the current domain-object's navigable parent.
+
+.. \... a method: then must be a no-arg method returning a non-primitive type (e.g. a getter)
+
+.. \... a field: then the field must be of non-primitive type and must also have a getter (as specified by the Java Beans Standard, particularly to allow `@PropertyLayout(navigable=Navigable.PARENT)` annotations on fields that use the lombok @Getter annotation)
+
+. Starting from the current domain-object, we search the object's class inheritance hierarchy (super class, super super class, ...), until we find the first class that has a `@PropertyLayout(navigable=Navigable.PARENT)` annotation.
+That's the one we use to resolve the current domain-object's navigable parent.
== User Experience
-When viewing a domain object that is part of a hierarchical structure, one can easily navigate to any parent of this object. Horizontally arranged text links separated by the 'greater than' symbol (>) are provided below the main menu. (Traditionally called breadcrumbs.)
+When viewing a domain object that is part of a hierarchical structure, one can easily navigate to any parent of this object.
+Horizontally arranged text links separated by the 'greater than' symbol (>) are provided below the main menu.
+(Traditionally called breadcrumbs.)
@@ -78,7 +90,8 @@ The navigable tree-structure, as provided by the 'Where am I' feature, is declar
== Configuration
-By default, the 'Where am I' feature will show a maximum of 64 links. This can be overridden using a property (in `isis.properties`), for example:
+By default, the 'Where am I' feature will show a maximum of 64 links.
+This can be overridden using a property (in `isis.properties`), for example:
[source,ini]
----
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_other-changes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_other-changes.adoc
index 9d6a0b9..76fd011 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_other-changes.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_other-changes.adoc
@@ -13,8 +13,8 @@
The default implementation of `UrlEncodingService` provided by the framework has changed:
-* in 1.16.x the implementation is *** TODO: look up ***
-* in 2.0.0-M1 this is changed to `UrlEncodingServiceWithCompression`
+* in 1.16.x the implementation is `o.a.i.applib.services.urlencoding.UrlEncodingServiceUsingBaseEncoding`
+* in 2.0.0-M1 this is changed to `o.a.i.applib.services.urlencoding.UrlEncodingServiceWithCompression`
This new implementation increases the state that can be encoded within the URL (approx 8000 characters) by first gzipping the state prior to base64 encoding the characters.
@@ -244,3 +244,7 @@ Consequently in 2.0.0-M1 this API has been split into three:
* `IsisJdoSupport_v3_2` (defined in `isis-core-plugins-jdo-datanucleus-5`) extends `IsisJdoSupport` with JDO 3.2-specific APIs
+
+== Swagger UI
+
+Swagger UI is now reinstated as a webjar, so there is no need to have any swagger UI files in the webapp (ISIS-1908).
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
index 0847670..9c49dd1 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
@@ -452,7 +452,7 @@ How to use the supporting xref:../../guides/rgcms/rgcms.adoc#_rgcms_methods_pref
|link:https://www.youtube.com/watch?v=qAJDGxztWIQ[044^] +
-How to use xref:../../guides/rgant/rgant.adoc#_rgant-DomainObject_bounded[`@DomainObject#bounded()`] so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.
+How to use xref:../../guides/rgant/rgant.adoc#_rgant-DomainObject_bounding[`@DomainObject#bounding()`] so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.
|||||||||x||
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
index c413257..41acab4 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc
@@ -343,7 +343,7 @@ In this section we focus on scalar reference properties.
* add some xref:../../guides/ugfun/ugfun.adoc#_ugfun_programming-model_properties[reference properties]
* update the corresponding domain service (for creation actoin)
* use different techniques to obtain references (shown in drop-down list box)
-** use the xref:../../guides/rgant/rgant.adoc#_rgant-DomainObject_bounded[`@DomainObjectLayout(bounded=...)`] annotation on the referenced type if there are only a small number (bounded) of instances
+** use the xref:../../guides/rgant/rgant.adoc#_rgant-DomainObject_bounding[`@DomainObjectLayout(bounding=...)`] annotation on the referenced type if there are only a small number (bounded) of instances
** use a xref:../../guides/rgcms/rgcms.adoc#_rgcms_methods_prefixes_choices[`choices...()`] supporting method
*** on a property
*** on an action parameter
diff --git a/migration-notes.adoc b/migration-notes.adoc
index fad01a7..24a3b4a 100644
--- a/migration-notes.adoc
+++ b/migration-notes.adoc
@@ -1,5 +1,7 @@
:toc:
+Search also for: "TODO: v2: " in the .adoc documentation.
+
== Migration Notes 2.0.0-M1 to 2.0.0-M2
=== @MemberGroupLayout was removed
@@ -325,3 +327,19 @@ to be configured using
----
isis.viewer.wicket.themes.provider=org.my.IsisWicketThemeSupport
----
+
+
+== Migration Notes 1.x to 2.0.0-M1
+
+This stuff needs to be properly documented
+
+=== java.time support (ISIS-1636)
+
+to document
+
+=== web-docker (ISIS-1969)
+
+To document, in particular how to use in the helloworld/simpleapp archetypes.
+
+NB: ISIS-1969: the Docker image isn't yet being released, pending https://issues.apache.org/jira/browse/INFRA-17518[INFRA-17518].
+