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 2018/08/06 09:46:00 UTC

[isis] branch ISIS-1810 updated (7c66895 -> 6b051c4)

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

danhaywood pushed a change to branch ISIS-1810
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 7c66895  ISIS-1810: more on migration notes
     new 3543496  ISIS-1810: more on migration notes
     new 6b051c4  ISIS-1810: more on migration notes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../_migration-notes_1.16.0-to-2.0.0-M1.adoc       | 447 +--------------------
 ...es_1.16.0-to-2.0.0-M1_removed-annotations.adoc} | 139 +------
 ...n-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc |  53 +++
 ...otes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc |  54 +++
 ...n-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc |  67 +++
 todo-deprecation-list.txt                          |  32 +-
 6 files changed, 183 insertions(+), 609 deletions(-)
 copy adocs/documentation/src/main/asciidoc/migration-notes/{_migration-notes_1.16.0-to-2.0.0-M1.adoc => _migration-notes_1.16.0-to-2.0.0-M1_removed-annotations.adoc} (81%)
 create mode 100644 adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc
 create mode 100644 adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc
 create mode 100644 adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc


[isis] 02/02: ISIS-1810: more on migration notes

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1810
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 6b051c4ede9024d3677fac50163a3a23878ba259
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 6 10:45:52 2018 +0100

    ISIS-1810: more on migration notes
---
 ...n-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc | 28 +++++++++++++++++--
 todo-deprecation-list.txt                          | 32 +---------------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc
index 3b9ce3f..a98c249 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc
@@ -32,11 +32,35 @@ PropertyDomainEvent
 |N-arg constructor
 |removed; just use the 0-arg ones
 
-|FixtureScript.
-ExecutionContext
+|FixtureScript
 |`asKeyValueMap(String)`
 |Removed; this shouldn't have had public visibility.
 
+|FixtureScript
+|`execute(...)`
+`executeChild(...)`
+`executeIfNotAlready(...)`
+`run(...)`
+|All removed or no longer public; use `FixtureScript.ExecutionContext#executeChild(...)` instead.
+
+|FixtureScript
+|`lookup(...)`
+|Removed; use `FixtureScript.ExecutionContext#lookup(...)` instead.
+
+|FixtureScript.
+ExecutionContext
+|`add(...)`
+|Removed; use `addResult(...)` instead.
+
+|FixtureScripts
+|deprecated constructors
+|Removed
+
+|FixtureScripts.
+MultipleExecutionStrategy
+|`IGNORE`
+|Removed, use `EXECUTE_ONCE_PER_CLASS` instead
+
 |===
 
 
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 9659c9a..179e1fe 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -189,47 +189,17 @@ DONE (REMOVED):
 
     remove explorationXxx() prefix
 
-org.apache.isis.applib
-
-
-
-
-    IsisApplibModule.java
-        ActionDomainEvent - the N-arg constructors (just use the 0-arg ones)
-        CollectionDomainEvent - the N arg constructors (just use the 0-arg ones)
-        PropertyDomainEvent  - the N arg constructors (just use the 0-arg ones)
-
-
 
 
 
 
-org.apache.isis.applib.filter
-
-    - entire package of Filter classes; use guava Predicate instead.
-
-
 org.apache.isis.applib.clock
     Clock.java -
         getTimeAsCalendar()
         getTimeAsDate()
 
-org.apache.isis.applib.fixturescripts
-    FixtureScript.ExecutionContext - various methods to simplify API
-        add(...) - use addResult(...) instead
-        asKeyValueMap(String) - removed; this shouldn't have had public visibility.
-
-    FixtureScript - various methods to simplify API
-        execute(...) and executeChild(...) - use ExecutionContext#executeChild(FixtureScript, String, FixtureScript)} instead
-        executeIfNotAlready(FixtureScript) - removed; this shouldn't have had public visibility.
-        lookup(String, Class<T>) - use ExecutionContext#lookup(...) instead
-        run(String) - no longer publically available (internal API for FixtureScripts to call).
-
-    FixtureScripts.java - remove deprecated constructors;
-
-    FixtureScripts.MultipleExecutionStrategy#IGNORE removed, replaced by EXECUTE_ONCE_BY_CLASS
-
 
+		
 org.apache.isis.applib.services.actinvoc
     ActionInvocationContext.java -remove unused constructors
 


[isis] 01/02: ISIS-1810: more on migration notes

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-1810
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 354349632d7955e6339e4ab0337c0f1cf7aec1bc
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 6 10:36:05 2018 +0100

    ISIS-1810: more on migration notes
---
 .../_migration-notes_1.16.0-to-2.0.0-M1.adoc       | 447 +--------------------
 ...es_1.16.0-to-2.0.0-M1_removed-annotations.adoc} | 139 +------
 ...n-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc |  53 +++
 ...otes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc |  54 +++
 ...n-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc |  43 ++
 5 files changed, 158 insertions(+), 578 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc
index 726c151..cfb37d7 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc
@@ -3,454 +3,19 @@
 :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/
-
+:toc:
 
 
 include::_migration-notes_1.16.0-to-2.0.0-M1_meta-annotations.adoc[leveloffset=+1]
-include::_migration-notes_1.16.0-to-2.0.0-M1_updated-annotations.adoc[leveloffset=+1]
-
-
-
-
-
-[[__migration-notes_1.15.0-to-1.16.0_removed-annotations]]
-== Removed annotations/attributes
-
-The following annotations, or attributes of annotations, have been removed
-
-.Removed annotations/attributes
-[cols="1l,1l,3a", options="header"]
-|===
-
-| Annotation
-| Attribute
-| Use instead
-
-|@Action
-|publishingPayloadFactory()
-|Removed, use the simpler xref:../guides/rgsvc/rgsvc.adoc#PublisherService[PublisherService] SPI instead.
-
-
-|@ActionInteraction
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_domainEvent[`@Action#domainEvent()`]
-
-|@ActionOrder
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_MemberOrder[`@MemberOrder()`]
-
-|@Aggregated
-|
-|Never implemented internally in Isis 1.x so no replacement.
-
-|@Audited
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_audited[`@DomainObject#auditing()`]
-
-|@AutoComplete
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_autoComplete[`@DomainObject#autoComplete()`]
-
-|@ActionSemantics
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_semantics[`@Action#semantics()`]
-
-|@Bookmarkable
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bookmarking[`@DomainObject#bookmarking()`]
-
-|@Bounded
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bounding[`@DomainObject#bounding()`]
-
-|@Bulk
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_invokeOn[`@Action#invokeOn()`]
-
-Similarly, the `Bulk.InteractionContext` domain service is replaced with the xref:../guides/rgsvc/rgsvc.adoc#ActionInvocationContext[ActionInvocationContext] domain service.
-
-
-|@Collection
-| notPersisted
-| Removed, replaced with xref:../guides/rgant/rgant.adoc#_rgant_Collection_mementoSerialization[`@Collection#mementoSerialization()`]
-
-|@CollectionInteraction
-|
-| xref:../guides/rgant/rgant.adoc#_rgant_Collection_domainEvent[`@Collection
-#domainEvent()`]
-
-|@CollectionLayout
-|render()
-|xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
-
-|@Command
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_command[`@Action#command()`]
-
-|@CssClass
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_cssClass[`@ActionLayout#cssClass()`], xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_cssClass[`@PropertyLayout#cssClass()`], xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_cssClass[`@CollectionLayout#cssClass()`], xref:../guides/rgant/rgant.adoc#_rgant_ParameterLayout_cssClass[`@ParameterLayout#cssClass()`], xref:../guides/rgant/rgant.adoc#_rgant_DomainObjectLayout_cssClass[`@DomainObjectLayout#cssClass()`] or xr [...]
-
-|@CssClassFa
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_cssClassFa[`@ActionLayout#cssClassFa()`], xref:../guides/rgant/rgant.adoc#_rgant_DomainObjectLayout_cssClassFa[`@DomainObjectLayout#cssClassFa()`] or xref:../guides/rgant/rgant.adoc#_rgant_ViewModelLayout_cssClassFa[`@ViewModelLayout#cssClassFa()`].
-
-|@Debug
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_restrictTo[`@Action#restrictTo()`]
-
-|@DescribedAs
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_describedAs[`@ActionLayout#describedAs()`], xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_describedAs[`@PropertyLayout#describedAs()`], xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_describedAs[`@CollectionLayout#describedAs()`], xref:../guides/rgant/rgant.adoc#_rgant_ParameterLayout_describedAs[`@ParameterLayout#describedAs()`], xref:../guides/rgant/rgant.adoc#_rgant_DomainObjectLayout_describedAs[`@DomainObje [...]
-
-|@Disabled
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Property_editingDisabledReason[`@Property#editingDisabledReason()`]
-
-.2+|@DomainObject
-|bounded
-|Deleted (was a boolean attribute), replaced by xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bounding[`@Property#bounding`]
-
-|publishingPayloadFactory
-|Removed, use the simpler xref:../guides/rgsvc/rgsvc.adoc#PublisherService[PublisherService] SPI instead.
-
-
-
-|@Exploration
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_restrictTo[`@Action#restrictTo()`]
-
-|@FieldOrder
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_MemberOrder[`@MemberOrder()`]
-
-|@Hidden
-|
-|For actions by either xref:../guides/rgant/rgant.adoc#_rgant_Action_hidden[`@Action#hidden()`] or xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_hidden[`@ActionLayout#hidden()`], for properties by either xref:../guides/rgant/rgant.adoc#_rgant_Property_hidden[`@Property#hidden()`] or xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_hidden[`@PropertyLayout#hidden()`], for collections by either xref:../guides/rgant/rgant.adoc#_rgant_Collection_hidden[`@Collection#hidden()`] or xr [...]
-
-|@Idempotent
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_semantics[`@Action#semantics()`]
-
-|@Ignore
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Programmatic[`@Programmatic`]
-
-|@Immutable
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_editing[`@DomainObject#editing()`]
-
-|@Mandatory
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_optionality[`@Property#optionality()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_optionality[`@Parameter#optionality()`].
-
-For properties, can also use xref:../guides/rgant/rgant.adoc#_rgant_Column_allowsNull[`@Column#allowsNull()`]
-Can also use xref:../guides/rgant/rgant.adoc#_rgant_Nullable[`@Nullable`] for either properties or parameters.
-
-|@Mask
-|
-|Removed, never implemented internally in Isis 1.x so no replacement.
-
-|@MaxLength
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_maxLength[`@Property#maxLength()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_maxLength[`@Parameter#maxLength()`].
-
-For properties, can also use xref:../guides/rgant/rgant.adoc#_rgant_Column_length[`@Column#length()`]
-
-|@MemberGroups
-|
-|xref:../guides/ugvw/ugvw.adoc#_ugvw_layout_file-based[.layout.xml] file instead.
-
-|@MultiLine
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_multiLine[`@PropertyLayout#multiLine()`] or xref:../guides/rgant/rgant.adoc#_rgant_ParameterLayout_multiLine[`@ParameterLayout#multiLine()`].
-
-|@MustSatisfy
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_mustSatisfy[`@Property#mustSatisfy()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_mustSatisfy[`@Parameter#mustSatisfy()`].
-
-|@NotPersisted
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Property_notPersisted[`@Property#notPersisted()`].
-
-|@Optional
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_optionality[`@Property#optionality()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_optionality[`@Parameter#optionality()`].
-
-For properties, can also use xref:../guides/rgant/rgant.adoc#_rgant_Column_allowsNull[`@Column#allowsNull()`]
-Can also use xref:../guides/rgant/rgant.adoc#_rgant_Nullable[`@Nullable`] for either properties or parameters.
-
-|@Named
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_named[`@ActionLayout#named()`], xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_named[`@PropertyLayout#named()`], xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_named[`@CollectionLayout#named()`], xref:../guides/rgant/rgant.adoc#_rgant_ParameterLayout_named[`@ParameterLayout#named()`], xref:../guides/rgant/rgant.adoc#_rgant_DomainObjectLayout_named[`@DomainObjectLayout#named()`] or xref:../guides/rgant/rgant.adoc# [...]
-
-|@NotInServiceMenu
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainService_nature[`@DomainService#nature()`]
-
-Specify nature of `VIEW_CONTRIBUTIONS_ONLY`.
-Alternatively, use a xref:../guides/rgant/rgant.adoc#_rgant_Mixin[mixin].
-
-|@NotContributed
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainService_nature[`@DomainService#nature()`]
-
-Specify nature of `VIEW_MENU_ONLY`.
-
-|@NotPersistable
-|
-|Never implemented internally in Isis 1.x so no replacement.
-
-|@ObjectType
-|
-|Removed, xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_objectType[`@DomainObject#objectType()`] or xref:../guides/rgant/rgant.adoc#_rgant_DomainService_objectType[`@DomainService#objectType()`]
-
-Alternatively, for domain entities either:
-
-* the xref:../guides/rgant/rgant.adoc#_rgant_Discriminator[`@Discriminator`] annotation can be specified; the value is used as the object type, or
-* the xref:../guides/rgant/rgant.adoc#_rgant_PersistenceCapable_schema[`@PersistenceCapable#schema()`] can be specified; the value is used as the concatenated with the class name to create a two part object type.
-
-|@Parameter
-|minLength()
-|Never implemented internally in Isis 1.x so no replacement.
-
-Note that the xref:../guides/rgant/rgant.adoc#_rgant_MinLength[`@MinLength`] annotation is for use with autocomplete supporting methods (specifying the minimum number of characters to enter before an auto-complete search is performed).
 
+include::_migration-notes_1.16.0-to-2.0.0-M1_updated-annotations.adoc[leveloffset=+1]
 
-|@Paged
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_paged[`@CollectionLayout#paged()`] (for parented collections), or xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_paged[`@DomainObject#paged()`] (for standalone collections)
-
-|@ParameterLayout
-| renderedAsDayBefore
-|Deleted (was a boolean attribute), replaced by xref:../guides/rgant/rgant.adoc#_rgant_ParameterLayout_renderDay[`@ParameterLayout#renderDay`].
-
-
-|@Plural
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObjectLayout_plural[`@DomainObjectLayout#plural()`]
-
-|@PostsAction
-InvokedEvent
-|
-| xref:../guides/rgant/rgant.adoc#_rgant_Action_domainEvent[`@Action#domainEvent()`]
-
-|@PostsCollection
-AddedToEvent
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Collection_domainEvent[`@Collection#domainEvent()`]
-
-|@PostsCollection
-RemovedFromEvent
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Collection_domainEvent[`@Collection#domainEvent()`]
-
-|@PostsProperty
-ChangedEvent
-|
-| xref:../guides/rgant/rgant.adoc#_rgant_Property_domainEvent[`@Property#domainEvent()`]
-
-|@Property
-| notPersisted
-| Removed, replaced with xref:../guides/rgant/rgant.adoc#_rgant_Collection_mementoSerialization[`@Collection#mementoSerialization()`]
-
-|@PropertyInteraction
-|
-| xref:../guides/rgant/rgant.adoc#_rgant_Property_domainEvent[`@Property#domainEvent()`]
-
-.2+|@PropertyLayout
-| renderedAsDayBefore
-|Deleted (was a boolean attribute), replaced by xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_renderDay[`@PropertyLayout#renderDay`].
-
-| unchanging
-| Deleted (was a boolean attribute), replaced by by xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_repainting[`@PropertyLayout#repainting`].
-
-
-|@Prototype
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_restrictTo[`@Action#restrictTo()`]
-
-|@PublishedAction
-|
-|Removed, use xref:../guides/rgant/rgant.adoc#_rgant-Action_publishing[@Action#publishing()]
-
-|@PublishedObject
-|
-|Removed, use xref:../guides/rgant/rgant.adoc#_rgant-DomainObject_publishing[@DomainObject#publishing()]
-
-|@PublishingPayload
-FactoryForAction
-|
-|Removed, use the simpler xref:../guides/rgsvc/rgsvc.adoc#PublisherService[PublisherService] SPI instead.
-
-|PublishingPayload
-FactoryForObject
-|
-|Removed, use the simpler xref:../guides/rgsvc/rgsvc.adoc#PublisherService[PublisherService] SPI instead.
-
-|@QueryOnly
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_Action_semantics[`@Action#semantics()`]
-
-|@Regex
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_regexPattern[`@Property#regexPattern()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_regexPattern[`@Parameter#regexPattern()`].
-
-|@Render
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
-
-Supporting `RenderType` enum also removed.
-
-|@RenderedAs
-DayBefore
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_Property_renderDay[`@Property#renderDay()`] or xref:../guides/rgant/rgant.adoc#_rgant_Parameter_renderDay[`@Parameter#renderDay()`].
-
-|@Resolve
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
-
-|@SortedBy
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_sortedBy[`@CollectionLayout#sortedBy()`]
-
-|@TypeOf
-|
-|Either xref:../guides/rgant/rgant.adoc#_rgant_CollectionLayout_typeOf[`@CollectionLayout#typeOf()`] (for parented collections), or xref:../guides/rgant/rgant.adoc#_rgant_ActionLayout_typeOf[`@ActionLayout#typeOf()`] (for actions returning a standalone collection).
-
-|@TypicalLength
-|
-|xref:../guides/rgant/rgant.adoc#_rgant_PropertyLayout_typicalLength[`@PropertyLayout#typicalLength()`].
-
-
-|===
-
-
-[[__migration-notes_1.15.0-to-1.16.0_removed-interfaces]]
-== Removed interfaces
-
-The following interfaces have been removed.
-
-.Removed interfaces
-[cols="1a,3a", options="header"]
-|===
-
-| Removed interface
-| Replaced with
-
-|`Auditable` +
-(JDO applib)
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_audited[`@DomainObject#auditing()`]
-
-|`Bounded` +
-(JDO applib)
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bounding[`@DomainObject#bounding()`]
-
-|`NotPersistable` +
-(JDO applib)
-|Never implemented internally in Isis 1.x so no replacement.
-
-|`ProgramPersistable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`AlwaysImmutable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`ImmutableOncePersisted` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`ImmutableUntilPersisted` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`NeverImmutable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-
-|===
-
-
-[[__migration-notes_1.15.0-to-1.16.0_updated-classes]]
-== Updated classes
-
-The following classes have been removed.
-
-.Updated classes
-[cols="2l,2a,3a", options="header"]
-|===
-
-| Updated class
-| Method
-| Nature of change
-
-|IsisAppModule.
-ActionDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|IsisAppModule.
-CollectionDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|IsisAppModule.
-PropertyDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|FixtureScript.
-ExecutionContext
-|`asKeyValueMap(String)`
-|Removed; this shouldn't have had public visibility.
-
-|===
-
-
-
-[[__migration-notes_1.15.0-to-1.16.0_removed--classes]]
-== Removed classes
-
-The following adapter classes have been removed.
-
-.Removed adapter classes
-[cols="1l,3a", options="header"]
-|===
-
-| Removed class
-| Replaced with
-
-|AbstractContainedObject
-| No replacement.
-
-|AbstractDomainObject
-| No replacement.
-
-|AbstractFactoryAndRepository
-| No replacement.
-
-|AbstractHomePageDashboardService
-| No replacement.
+include::_migration-notes_1.16.0-to-2.0.0-M1_removed-annotations.adoc[leveloffset=+1]
 
-|===
+include::_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc[leveloffset=+1]
 
-Also, all classes and interfaces in `org.apache.isis.applib.filter` have been removed.
-Instead, the `java.util.Predicate<T>` interface is used.
+include::_migration-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc[leveloffset=+1]
 
-For example, `RepositoryService#allMatches(...)` method, which allows client-side filtering of results (typically during prototyping), now has the signature:
+include::_migration-notes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc[leveloffset=+1]
 
-[source,java]
-----
-public interface RepositoryService {
-    ...
-    <T> List<T> allMatches(
-                    final Class<T> ofType,
-                    final Predicate<? super T> predicate,
-                    long... range);
 
-}
-----
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-annotations.adoc
similarity index 81%
copy from adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc
copy to adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-annotations.adoc
index 726c151..137c353 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-annotations.adoc
@@ -1,21 +1,13 @@
-[[_migration-notes_1.15.0-to-1.16.0]]
-= From v1.16.x to 1.16.0
+[[_migration-notes_1.15.0-to-1.16.0_removed-annotations]]
+= Removed annotations/attributes
 :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/
 
 
 
-include::_migration-notes_1.16.0-to-2.0.0-M1_meta-annotations.adoc[leveloffset=+1]
-include::_migration-notes_1.16.0-to-2.0.0-M1_updated-annotations.adoc[leveloffset=+1]
 
 
-
-
-
-[[__migration-notes_1.15.0-to-1.16.0_removed-annotations]]
-== Removed annotations/attributes
-
 The following annotations, or attributes of annotations, have been removed
 
 .Removed annotations/attributes
@@ -327,130 +319,3 @@ DayBefore
 |===
 
 
-[[__migration-notes_1.15.0-to-1.16.0_removed-interfaces]]
-== Removed interfaces
-
-The following interfaces have been removed.
-
-.Removed interfaces
-[cols="1a,3a", options="header"]
-|===
-
-| Removed interface
-| Replaced with
-
-|`Auditable` +
-(JDO applib)
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_audited[`@DomainObject#auditing()`]
-
-|`Bounded` +
-(JDO applib)
-|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bounding[`@DomainObject#bounding()`]
-
-|`NotPersistable` +
-(JDO applib)
-|Never implemented internally in Isis 1.x so no replacement.
-
-|`ProgramPersistable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`AlwaysImmutable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`ImmutableOncePersisted` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`ImmutableUntilPersisted` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-|`NeverImmutable` +
-(JDO applib)
-|Never implemented fully in Isis 1.x so no replacement.
-
-
-|===
-
-
-[[__migration-notes_1.15.0-to-1.16.0_updated-classes]]
-== Updated classes
-
-The following classes have been removed.
-
-.Updated classes
-[cols="2l,2a,3a", options="header"]
-|===
-
-| Updated class
-| Method
-| Nature of change
-
-|IsisAppModule.
-ActionDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|IsisAppModule.
-CollectionDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|IsisAppModule.
-PropertyDomainEvent
-|N-arg constructor
-|removed; just use the 0-arg ones
-
-|FixtureScript.
-ExecutionContext
-|`asKeyValueMap(String)`
-|Removed; this shouldn't have had public visibility.
-
-|===
-
-
-
-[[__migration-notes_1.15.0-to-1.16.0_removed--classes]]
-== Removed classes
-
-The following adapter classes have been removed.
-
-.Removed adapter classes
-[cols="1l,3a", options="header"]
-|===
-
-| Removed class
-| Replaced with
-
-|AbstractContainedObject
-| No replacement.
-
-|AbstractDomainObject
-| No replacement.
-
-|AbstractFactoryAndRepository
-| No replacement.
-
-|AbstractHomePageDashboardService
-| No replacement.
-
-|===
-
-Also, all classes and interfaces in `org.apache.isis.applib.filter` have been removed.
-Instead, the `java.util.Predicate<T>` interface is used.
-
-For example, `RepositoryService#allMatches(...)` method, which allows client-side filtering of results (typically during prototyping), now has the signature:
-
-[source,java]
-----
-public interface RepositoryService {
-    ...
-    <T> List<T> allMatches(
-                    final Class<T> ofType,
-                    final Predicate<? super T> predicate,
-                    long... range);
-
-}
-----
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc
new file mode 100644
index 0000000..e947856
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-classes.adoc
@@ -0,0 +1,53 @@
+[[_migration-notes_1.15.0-to-1.16.0_removed-classes]]
+= Removed classes
+: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/
+
+
+
+== Adapter classes
+
+The following adapter classes have been removed.
+
+.Removed adapter classes
+[cols="1l,3a", options="header"]
+|===
+
+| Removed class
+| Replaced with
+
+|AbstractContainedObject
+| No replacement.
+
+|AbstractDomainObject
+| No replacement.
+
+|AbstractFactoryAndRepository
+| No replacement.
+
+|AbstractHomePageDashboardService
+| No replacement.
+
+|===
+
+
+
+== Filter classes/interfaces
+
+Also, all classes and interfaces in `org.apache.isis.applib.filter` have been removed.
+Instead, the `java.util.Predicate<T>` interface is used.
+
+For example, `RepositoryService#allMatches(...)` method, which allows client-side filtering of results (typically during prototyping), now has the signature:
+
+[source,java]
+----
+public interface RepositoryService {
+    ...
+    <T> List<T> allMatches(
+                    final Class<T> ofType,
+                    final Predicate<? super T> predicate,
+                    long... range);
+
+}
+----
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc
new file mode 100644
index 0000000..60be69d
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_removed-interfaces.adoc
@@ -0,0 +1,54 @@
+[[_migration-notes_1.15.0-to-1.16.0_removed-interfaces]]
+= Removed interfaces
+: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/
+
+
+
+
+The following interfaces have been removed.
+
+.Removed interfaces
+[cols="1a,3a", options="header"]
+|===
+
+| Removed interface
+| Replaced with
+
+|`Auditable` +
+(JDO applib)
+|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_audited[`@DomainObject#auditing()`]
+
+|`Bounded` +
+(JDO applib)
+|xref:../guides/rgant/rgant.adoc#_rgant_DomainObject_bounding[`@DomainObject#bounding()`]
+
+|`NotPersistable` +
+(JDO applib)
+|Never implemented internally in Isis 1.x so no replacement.
+
+|`ProgramPersistable` +
+(JDO applib)
+|Never implemented fully in Isis 1.x so no replacement.
+
+|`AlwaysImmutable` +
+(JDO applib)
+|Never implemented fully in Isis 1.x so no replacement.
+
+|`ImmutableOncePersisted` +
+(JDO applib)
+|Never implemented fully in Isis 1.x so no replacement.
+
+|`ImmutableUntilPersisted` +
+(JDO applib)
+|Never implemented fully in Isis 1.x so no replacement.
+
+|`NeverImmutable` +
+(JDO applib)
+|Never implemented fully in Isis 1.x so no replacement.
+
+
+|===
+
+
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc
new file mode 100644
index 0000000..3b9ce3f
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.16.0-to-2.0.0-M1_updated-classes.adoc
@@ -0,0 +1,43 @@
+[[_migration-notes_1.15.0-to-1.16.0_updated-classes]]
+= Updated classes
+: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/
+
+
+
+
+The following classes have been removed.
+
+.Updated classes
+[cols="2l,2a,3a", options="header"]
+|===
+
+| Updated class
+| Method
+| Nature of change
+
+|IsisAppModule.
+ActionDomainEvent
+|N-arg constructor
+|removed; just use the 0-arg ones
+
+|IsisAppModule.
+CollectionDomainEvent
+|N-arg constructor
+|removed; just use the 0-arg ones
+
+|IsisAppModule.
+PropertyDomainEvent
+|N-arg constructor
+|removed; just use the 0-arg ones
+
+|FixtureScript.
+ExecutionContext
+|`asKeyValueMap(String)`
+|Removed; this shouldn't have had public visibility.
+
+|===
+
+
+