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 2020/03/27 16:53:06 UTC
[isis] branch ISIS-2062 updated (124c966 -> 06a43ce)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 124c966 ISIS-2062: reviews classes in refguide
new 63fc665 ISIS-2062: refguide, methods
new 4872bb9 ISIS-2062: refguide classes reorg
new 06a43ce ISIS-2062: adds TODOs for stuff still, well, todo
The 3 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:
.../components/docs/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/pages/landing-page/releases.adoc | 2 +-
.../modules/ROOT/partials/module-nav/releases.adoc | 2 +-
.../resources/attachments/IsisCheatSheet.docx | Bin 23869 -> 24336 bytes
.../resources/attachments/IsisCheatSheet.pdf | Bin 179877 -> 195020 bytes
api/adoc/refguide/modules/ROOT/pages/about.adoc | 3 +-
.../modules/ROOT/partials/component-nav.adoc | 3 +-
.../btb/pages/hints-and-tips/custom-css.adoc | 2 +-
.../hints-and-tips/view-model-instantiation.adoc | 2 +-
.../applib-ant/pages/ActionLayout/redirect.adoc | 2 +-
.../applib-ant/pages/Collection/editing.adoc | 2 +-
.../main/adoc/modules/applib-ant/pages/Column.adoc | 2 +-
.../pages/DomainObject/autoCompleteRepository.adoc | 2 +-
.../applib-ant/pages/DomainObject/bounding.adoc | 2 +-
.../DomainObject/persistingLifecycleEvent.adoc | 2 +-
.../pages/DomainObject/removingLifecycleEvent.adoc | 2 +-
.../pages/DomainObject/updatingLifecycleEvent.adoc | 2 +-
.../pages/DomainObjectLayout/cssClassFa.adoc | 2 +-
.../pages/DomainObjectLayout/cssClassUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/iconUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/layoutUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/titleUiEvent.adoc | 2 +-
.../applib-ant/pages/DomainService/objectType.adoc | 2 +-
.../adoc/modules/applib-ant/pages/MinLength.adoc | 2 +-
.../adoc/modules/applib-ant/pages/Parameter.adoc | 4 +-
.../applib-ant/pages/Parameter/fileAccept.adoc | 4 +-
.../adoc/modules/applib-ant/pages/PrimaryKey.adoc | 2 +-
.../adoc/modules/applib-ant/pages/Property.adoc | 4 +-
.../modules/applib-ant/pages/Property/editing.adoc | 2 +-
.../applib-ant/pages/Property/fileAccept.adoc | 2 +-
.../modules/applib-ant/pages/XmlRootElement.adoc | 4 +-
.../{applib-cm => applib-classes}/examples.sh | 0
.../examples/clock/Clock.java | 0
.../examples/clock/package-info.java | 0
.../examples/domain/DomainObjectList.java | 0
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../examples/events/EventObjectBase.java | 0
.../events/domain/AbstractDomainEvent.java | 0
.../examples/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../examples/events/ui/AbstractUiEvent.java | 0
.../examples/events/ui/CssClassUiEvent.java | 0
.../examples/events/ui/IconUiEvent.java | 0
.../examples/events/ui/LayoutUiEvent.java | 0
.../examples/events/ui/TitleUiEvent.java | 0
.../examples/graph/Edge.java | 0
.../examples/graph/SimpleEdge.java | 0
.../examples/graph/Vertex.java | 0
.../examples/graph/tree/LazyTreeNode.java | 0
.../examples/graph/tree/TreeAdapter.java | 0
.../examples/graph/tree/TreeNode.java | 0
.../graph/tree/TreeNode_iteratorBreadthFirst.java | 0
.../graph/tree/TreeNode_iteratorDepthFirst.java | 0
.../graph/tree/TreeNode_iteratorHierarchyUp.java | 0
.../examples/graph/tree/TreePath.java | 0
.../examples/graph/tree/TreePath_Default.java | 0
.../examples/graph/tree/TreeState.java | 0
.../examples/graph/tree/TreeState_Default.java | 0
.../layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 0
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/CssClassFaPosition.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../examples/layout/component/FieldSet.java | 0
.../examples/layout/component/FieldSetOwner.java | 0
.../examples/layout/component/HasBookmarking.java | 0
.../examples/layout/component/HasCssClass.java | 0
.../examples/layout/component/HasCssClassFa.java | 0
.../examples/layout/component/HasDescribedAs.java | 0
.../examples/layout/component/HasHidden.java | 0
.../examples/layout/component/HasNamed.java | 0
.../examples/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../examples/layout/component/Owned.java | 0
.../examples/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 0
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../examples/layout/component/package-info.java | 0
.../examples/layout/grid/Grid.java | 0
.../examples/layout/grid/GridAbstract.java | 0
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../examples/layout/grid/bootstrap3/BS3Col.java | 0
.../layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../examples/layout/grid/bootstrap3/BS3Grid.java | 0
.../examples/layout/grid/bootstrap3/BS3Row.java | 0
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../examples/layout/grid/bootstrap3/BS3Tab.java | 0
.../layout/grid/bootstrap3/BS3TabGroup.java | 0
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../examples/layout/grid/bootstrap3/HasCssId.java | 0
.../examples/layout/grid/bootstrap3/Size.java | 0
.../examples/layout/grid/bootstrap3/SizeSpan.java | 0
.../layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../examples/layout/links/Link.java | 0
.../examples/layout/links/package-info.java | 0
.../examples/layout/menubars/Menu.java | 0
.../examples/layout/menubars/MenuBar.java | 0
.../examples/layout/menubars/MenuBars.java | 0
.../examples/layout/menubars/MenuBarsAbstract.java | 0
.../examples/layout/menubars/MenuSection.java | 0
.../layout/menubars/bootstrap3/BS3Menu.java | 0
.../layout/menubars/bootstrap3/BS3MenuBar.java | 0
.../layout/menubars/bootstrap3/BS3MenuBars.java | 0
.../layout/menubars/bootstrap3/BS3MenuSection.java | 0
.../layout/menubars/bootstrap3/package-info.java | 0
.../examples/layout/package-info.java | 0
.../examples/mixins/MixinConstants.java | 0
.../examples/mixins/dto/Dto.java | 0
.../examples/mixins/dto/Dto_downloadXml.java | 0
.../examples/mixins/dto/Dto_downloadXsd.java | 0
.../examples/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../examples/mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../examples/mixins/timestamp/HoldsUpdatedAt.java | 0
.../examples/mixins/timestamp/HoldsUpdatedBy.java | 0
.../examples/mixins/timestamp/Timestampable.java | 0
.../examples/mixins/timestamp/package-info.java | 0
.../examples/spec/AbstractSpecification.java | 0
.../examples/spec/AbstractSpecification2.java | 0
.../examples/spec/Specification.java | 0
.../examples/spec/Specification2.java | 0
.../examples/spec/SpecificationAnd.java | 0
.../examples/spec/SpecificationNot.java | 0
.../examples/spec/SpecificationOr.java | 0
.../examples/spec/package-info.java | 0
.../examples/util/Enums.java | 0
.../examples/util/Equality.java | 0
.../examples/util/Hashing.java | 0
.../examples/util/JaxbAdapters.java | 0
.../examples/util/JaxbUtil.java | 0
.../examples/util/ObjectContract_Empty.java | 0
.../examples/util/ObjectContract_Impl.java | 0
.../examples/util/ObjectContract_Parser.java | 0
.../examples/util/ObjectContracts.java | 0
.../examples/util/ReasonBuffer.java | 0
.../examples/util/ReasonBuffer2.java | 0
.../examples/util/Reasons.java | 0
.../examples/util/TitleBuffer.java | 0
.../examples/util/TitleBufferException.java | 0
.../examples/util/ToString.java | 0
.../examples/util/ZipWriter.java | 0
.../examples/util/package-info.java | 0
.../examples/util/schema/ChangesDtoUtils.java | 0
.../examples/util/schema/CommandDtoUtils.java | 0
.../examples/util/schema/CommonDtoUtils.java | 0
.../examples/util/schema/InteractionDtoUtils.java | 0
.../util/schema/MemberExecutionDtoUtils.java | 0
.../examples/value/Blob.java | 0
.../examples/value/Clob.java | 0
.../examples/value/Image.java | 0
.../examples/value/LocalResourcePath.java | 0
.../examples/value/Markup.java | 0
.../examples/value/NamedWithMimeType.java | 0
.../examples/value/Password.java | 0
.../examples/value/package-info.java | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../images/value-types/markup.png | Bin
.../modules/{applib-cm => applib-classes}/nav.adoc | 0
.../pages}/ViewModel.adoc | 0
.../adoc/modules/applib-classes}/pages/about.adoc | 10 +-
.../adoc/modules/applib-classes/pages/events.adoc | 7 +-
.../pages/events}/domainevent.adoc | 8 +-
.../events}/domainevent/AbstractDomainEvent.adoc | 6 +-
.../events}/domainevent/ActionDomainEvent.adoc | 2 +-
.../events}/domainevent/CollectionDomainEvent.adoc | 2 +-
.../events}/domainevent/PropertyDomainEvent.adoc | 2 +-
.../pages/events}/lifecycleevent.adoc | 17 +-
.../lifecycleevent/AbstractLifecycleEvent.adoc | 14 +-
.../events}/lifecycleevent/ObjectCreatedEvent.adoc | 2 +-
.../events}/lifecycleevent/ObjectLoadedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistingEvent.adoc | 2 +-
.../lifecycleevent/ObjectRemovingEvent.adoc | 2 +-
.../events}/lifecycleevent/ObjectUpdatedEvent.adoc | 2 +-
.../lifecycleevent/ObjectUpdatingEvent.adoc | 2 +-
.../pages/events}/uievent.adoc | 23 ++-
.../pages/events}/uievent/CssClassUiEvent.adoc | 2 +-
.../pages/events}/uievent/IconUiEvent.adoc | 2 +-
.../pages/events}/uievent/TitleUiEvent.adoc | 2 +-
.../classes => applib-classes/pages}/i18n.adoc | 1 +
.../pages}/i18n/TranslatableString.adoc | 0
.../pages/layout.adoc} | 6 +-
.../pages/layout}/menubars.adoc | 5 +-
.../pages/layout/object-layout.adoc} | 3 +-
.../pages/roles-mixins-contributees.adoc} | 18 +-
.../roles-mixins-contributees}/contributee.adoc | 11 +-
.../pages/roles-mixins-contributees}/mixins.adoc | 0
.../roles-mixins-contributees}/mixins/Dto.adoc | 6 +-
.../roles-mixins-contributees}/mixins/Object.adoc | 2 +-
.../mixins/Persistable.adoc | 4 +-
.../pages/roles-mixins-contributees}/roles.adoc | 0
.../roles/HoldsUpdatedAt.adoc | 2 +-
.../roles/HoldsUpdatedBy.adoc | 2 +-
.../roles/Timestampable.adoc | 4 +-
.../classes => applib-classes/pages}/spec.adoc | 13 +-
.../classes => applib-classes/pages}/utility.adoc | 2 +-
.../pages}/utility/Enums.adoc | 0
.../pages}/utility/ObjectContracts.adoc | 0
.../pages}/utility/Reasons.adoc | 0
.../pages}/utility/TitleBuffer.adoc | 2 +-
.../pages}/value-types.adoc | 29 ++-
.../pages}/value-types/Blob.adoc | 0
.../pages}/value-types/Clob.adoc | 0
.../pages}/value-types/Markup.adoc | 0
.../applib-classes/partials/module-nav.adoc | 12 ++
.../main/adoc/modules/applib-cm/pages/about.adoc | 12 --
.../main/adoc/modules/applib-cm/pages/classes.adoc | 23 ---
.../applib-cm/pages/methods/lifecycle/created.adoc | 16 --
.../applib-cm/pages/methods/lifecycle/jdo-api.adoc | 50 -----
.../applib-cm/pages/methods/lifecycle/removed.adoc | 15 --
.../modules/applib-cm/pages/methods/prefixes.adoc | 217 ---------------------
.../modules/applib-cm/partials/module-nav.adoc | 9 -
.../{applib-cm => applib-methods}/examples.sh | 0
.../applib-methods/examples}/clock/Clock.java | 0
.../examples}/clock/package-info.java | 0
.../examples}/domain/DomainObjectList.java | 0
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../examples}/events/EventObjectBase.java | 0
.../events/domain/AbstractDomainEvent.java | 0
.../examples}/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../examples}/events/ui/AbstractUiEvent.java | 0
.../examples}/events/ui/CssClassUiEvent.java | 0
.../examples}/events/ui/IconUiEvent.java | 0
.../examples}/events/ui/LayoutUiEvent.java | 0
.../examples}/events/ui/TitleUiEvent.java | 0
.../applib-methods/examples}/graph/Edge.java | 0
.../applib-methods/examples}/graph/SimpleEdge.java | 0
.../applib-methods/examples}/graph/Vertex.java | 0
.../examples}/graph/tree/LazyTreeNode.java | 0
.../examples}/graph/tree/TreeAdapter.java | 0
.../examples}/graph/tree/TreeNode.java | 0
.../graph/tree/TreeNode_iteratorBreadthFirst.java | 0
.../graph/tree/TreeNode_iteratorDepthFirst.java | 0
.../graph/tree/TreeNode_iteratorHierarchyUp.java | 0
.../examples}/graph/tree/TreePath.java | 0
.../examples}/graph/tree/TreePath_Default.java | 0
.../examples}/graph/tree/TreeState.java | 0
.../examples}/graph/tree/TreeState_Default.java | 0
.../layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 0
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/CssClassFaPosition.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../examples}/layout/component/FieldSet.java | 0
.../examples}/layout/component/FieldSetOwner.java | 0
.../examples}/layout/component/HasBookmarking.java | 0
.../examples}/layout/component/HasCssClass.java | 0
.../examples}/layout/component/HasCssClassFa.java | 0
.../examples}/layout/component/HasDescribedAs.java | 0
.../examples}/layout/component/HasHidden.java | 0
.../examples}/layout/component/HasNamed.java | 0
.../examples}/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../examples}/layout/component/Owned.java | 0
.../examples}/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 0
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../examples}/layout/component/package-info.java | 0
.../applib-methods/examples}/layout/grid/Grid.java | 0
.../examples}/layout/grid/GridAbstract.java | 0
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../examples}/layout/grid/bootstrap3/BS3Col.java | 0
.../layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../examples}/layout/grid/bootstrap3/BS3Grid.java | 0
.../examples}/layout/grid/bootstrap3/BS3Row.java | 0
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../examples}/layout/grid/bootstrap3/BS3Tab.java | 0
.../layout/grid/bootstrap3/BS3TabGroup.java | 0
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../examples}/layout/grid/bootstrap3/HasCssId.java | 0
.../examples}/layout/grid/bootstrap3/Size.java | 0
.../examples}/layout/grid/bootstrap3/SizeSpan.java | 0
.../layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../examples}/layout/links/Link.java | 0
.../examples}/layout/links/package-info.java | 0
.../examples}/layout/menubars/Menu.java | 0
.../examples}/layout/menubars/MenuBar.java | 0
.../examples}/layout/menubars/MenuBars.java | 0
.../layout/menubars/MenuBarsAbstract.java | 0
.../examples}/layout/menubars/MenuSection.java | 0
.../layout/menubars/bootstrap3/BS3Menu.java | 0
.../layout/menubars/bootstrap3/BS3MenuBar.java | 0
.../layout/menubars/bootstrap3/BS3MenuBars.java | 0
.../layout/menubars/bootstrap3/BS3MenuSection.java | 0
.../layout/menubars/bootstrap3/package-info.java | 0
.../examples}/layout/package-info.java | 0
.../examples}/mixins/MixinConstants.java | 0
.../applib-methods/examples}/mixins/dto/Dto.java | 0
.../examples}/mixins/dto/Dto_downloadXml.java | 0
.../examples}/mixins/dto/Dto_downloadXsd.java | 0
.../examples}/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../examples}/mixins/timestamp/HoldsUpdatedAt.java | 0
.../examples}/mixins/timestamp/HoldsUpdatedBy.java | 0
.../examples}/mixins/timestamp/Timestampable.java | 0
.../examples}/mixins/timestamp/package-info.java | 0
.../examples}/spec/AbstractSpecification.java | 0
.../examples}/spec/AbstractSpecification2.java | 0
.../examples}/spec/Specification.java | 0
.../examples}/spec/Specification2.java | 0
.../examples}/spec/SpecificationAnd.java | 0
.../examples}/spec/SpecificationNot.java | 0
.../examples}/spec/SpecificationOr.java | 0
.../examples}/spec/package-info.java | 0
.../applib-methods/examples}/util/Enums.java | 0
.../applib-methods/examples}/util/Equality.java | 0
.../applib-methods/examples}/util/Hashing.java | 0
.../examples}/util/JaxbAdapters.java | 0
.../applib-methods/examples}/util/JaxbUtil.java | 0
.../examples}/util/ObjectContract_Empty.java | 0
.../examples}/util/ObjectContract_Impl.java | 0
.../examples}/util/ObjectContract_Parser.java | 0
.../examples}/util/ObjectContracts.java | 0
.../examples}/util/ReasonBuffer.java | 0
.../examples}/util/ReasonBuffer2.java | 0
.../applib-methods/examples}/util/Reasons.java | 0
.../applib-methods/examples}/util/TitleBuffer.java | 0
.../examples}/util/TitleBufferException.java | 0
.../applib-methods/examples}/util/ToString.java | 0
.../applib-methods/examples}/util/ZipWriter.java | 0
.../examples}/util/package-info.java | 0
.../examples}/util/schema/ChangesDtoUtils.java | 0
.../examples}/util/schema/CommandDtoUtils.java | 0
.../examples}/util/schema/CommonDtoUtils.java | 0
.../examples}/util/schema/InteractionDtoUtils.java | 0
.../util/schema/MemberExecutionDtoUtils.java | 0
.../applib-methods/examples}/value/Blob.java | 0
.../applib-methods/examples}/value/Clob.java | 0
.../applib-methods/examples}/value/Image.java | 0
.../examples}/value/LocalResourcePath.java | 0
.../applib-methods/examples}/value/Markup.java | 0
.../examples}/value/NamedWithMimeType.java | 0
.../applib-methods/examples}/value/Password.java | 0
.../examples}/value/package-info.java | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../applib-methods}/images/value-types/markup.png | Bin
.../src/main/adoc/modules/applib-methods}/nav.adoc | 0
.../pages/about.adoc} | 7 +-
.../pages}/lifecycle.adoc | 49 ++---
.../applib-methods/pages/lifecycle/created.adoc | 0
.../pages}/lifecycle/loaded.adoc | 2 +-
.../pages}/lifecycle/persisted.adoc | 4 +-
.../pages}/lifecycle/persisting.adoc | 4 +-
.../pages}/lifecycle/removing.adoc | 4 +-
.../pages}/lifecycle/updated.adoc | 4 +-
.../pages}/lifecycle/updating.adoc | 4 +-
.../modules/applib-methods/pages/prefixes.adoc | 212 ++++++++++++++++++++
.../pages}/prefixes/autoComplete.adoc | 49 ++---
.../pages}/prefixes/choices.adoc | 45 +++--
.../pages}/prefixes/default.adoc | 102 ++++------
.../pages/prefixes/deprecated}/addTo.adoc | 2 +-
.../pages/prefixes/deprecated}/clear.adoc | 2 +-
.../pages/prefixes/deprecated}/modify.adoc | 2 +-
.../pages/prefixes/deprecated}/removeFrom.adoc | 2 +-
.../pages/prefixes/deprecated}/validate.adoc | 0
.../pages/prefixes/deprecated}/validateAddTo.adoc | 2 +-
.../prefixes/deprecated}/validateRemoveFrom.adoc | 2 +-
.../pages}/prefixes/disable.adoc | 81 +++++---
.../pages}/prefixes/get.adoc | 2 +-
.../pages}/prefixes/hide.adoc | 69 ++++---
.../pages}/prefixes/set.adoc | 4 +-
.../methods => applib-methods/pages}/reserved.adoc | 36 ++--
.../pages}/reserved/cssClass.adoc | 13 +-
.../pages/reserved/deprecated}/disable.adoc | 6 +-
.../pages/reserved/deprecated}/getId.adoc | 2 +-
.../pages/reserved/deprecated}/hide.adoc | 8 +-
.../pages/reserved/deprecated}/validate.adoc | 2 +-
.../pages}/reserved/iconName.adoc | 10 +-
.../pages}/reserved/layout.adoc | 14 +-
.../pages}/reserved/title.adoc | 39 ++--
.../applib-methods/partials/module-nav.adoc | 8 +
.../modules/applib-svc/pages/AuditerService.adoc | 2 +-
.../modules/applib-svc/pages/CommandService.adoc | 2 +-
.../applib-svc/pages/ConfigurationViewService.adoc | 3 +-
.../applib-svc/pages/ContentMappingService.adoc | 2 +-
.../modules/applib-svc/pages/DeepLinkService.adoc | 2 +-
.../applib-svc/pages/EmailNotificationService.adoc | 2 +-
.../modules/applib-svc/pages/EmailService.adoc | 3 +-
.../applib-svc/pages/ErrorReportingService.adoc | 2 +-
.../modules/applib-svc/pages/EventBusService.adoc | 4 +-
.../applib-svc/pages/ExceptionRecognizer.adoc | 2 +-
.../pages/ExceptionRecognizerService.adoc | 2 +-
.../modules/applib-svc/pages/FactoryService.adoc | 7 +-
.../applib-svc/pages/GridLoaderService.adoc | 7 +-
.../adoc/modules/applib-svc/pages/GridService.adoc | 8 +-
.../applib-svc/pages/GridSystemService.adoc | 2 +-
.../adoc/modules/applib-svc/pages/HintStore.adoc | 4 +-
.../applib-svc/pages/InteractionContext.adoc | 4 +-
.../adoc/modules/applib-svc/pages/JaxbService.adoc | 4 +-
.../modules/applib-svc/pages/LayoutService.adoc | 5 +-
.../applib-svc/pages/LayoutServiceMenu.adoc | 1 +
.../modules/applib-svc/pages/LocaleProvider.adoc | 1 +
.../applib-svc/pages/MenuBarsLoaderService.adoc | 3 +-
.../modules/applib-svc/pages/MenuBarsService.adoc | 5 +-
.../modules/applib-svc/pages/MessageService.adoc | 1 +
.../modules/applib-svc/pages/MetaModelService.adoc | 1 +
.../applib-svc/pages/MetaModelServiceMenu.adoc | 2 +
.../modules/applib-svc/pages/MetricsService.adoc | 1 +
.../modules/applib-svc/pages/PublisherService.adoc | 5 +-
.../applib-svc/pages/QueryResultsCache.adoc | 3 +-
.../applib-svc/pages/QueryResultsCacheControl.adoc | 2 +
.../applib-svc/pages/RepositoryService.adoc | 2 +-
.../modules/applib-svc/pages/RoutingService.adoc | 3 +-
.../adoc/modules/applib-svc/pages/Scratchpad.adoc | 4 +-
.../modules/applib-svc/pages/ServiceInjector.adoc | 3 +-
.../modules/applib-svc/pages/ServiceRegistry.adoc | 4 +-
.../applib-svc/pages/SessionLoggingService.adoc | 1 +
.../adoc/modules/applib-svc/pages/SudoService.adoc | 3 +-
.../modules/applib-svc/pages/SwaggerService.adoc | 3 +-
.../applib-svc/pages/TableColumnOrderService.adoc | 3 +-
.../modules/applib-svc/pages/TitleService.adoc | 4 +-
.../applib-svc/pages/TransactionService.adoc | 4 +-
.../applib-svc/pages/TranslationService.adoc | 1 +
.../applib-svc/pages/TranslationsResolver.adoc | 2 +-
.../applib-svc/pages/UrlEncodingService.adoc | 2 +-
.../applib-svc/pages/UserProfileService.adoc | 2 +-
.../applib-svc/pages/UserRegistrationService.adoc | 2 +-
.../adoc/modules/applib-svc/pages/UserService.adoc | 2 +-
.../modules/applib-svc/pages/WrapperFactory.adoc | 15 +-
.../applib-svc/pages/XmlSnapshotService.adoc | 1 +
.../main/adoc/modules/applib-svc/pages/about.adoc | 4 +-
.../src/main/adoc/modules/core/pages/about.adoc | 2 +-
.../adoc/modules/audit-trail/pages/about.adoc | 3 +-
.../secman/adoc/modules/secman/pages/about.adoc | 2 +
.../adoc/modules/session-log/pages/about.adoc | 2 +-
.../adoc/modules/shiro-realm-ldap/pages/about.adoc | 6 +-
.../vro/cors/adoc/modules/cors/pages/about.adoc | 4 +-
.../adoc/modules/cors/partials/module-nav.adoc | 5 +-
.../adoc/modules/exceldownload/pages/about.adoc | 3 +-
.../adoc/modules/fullcalendar/pages/about.adoc | 3 +-
.../vw/gmap3/adoc/modules/gmap3/pages/about.adoc | 3 +-
.../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc | 3 +-
.../src/main/adoc/modules/model/pages/about.adoc | 3 +-
.../adoc/modules/microprofile/pages/about.adoc | 3 +-
legacy/adoc/modules/ROOT/nav.adoc | 2 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 2 -
.../src/main/adoc/modules/applib/pages/about.adoc | 2 +-
.../adoc/modules/applib/partials/module-nav.adoc | 3 -
.../src/main/adoc/modules/commons/pages/about.adoc | 3 +-
.../adoc/modules/commons/partials/module-nav.adoc | 3 -
.../src/main/adoc/modules/runtime/pages/about.adoc | 3 +-
.../adoc/modules/runtime/partials/module-nav.adoc | 3 -
.../main/adoc/modules/restclient/pages/about.adoc | 3 +-
.../modules/restclient/partials/module-nav.adoc | 3 -
.../main/adoc/modules/servletapi/pages/about.adoc | 3 +-
.../modules/servletapi/partials/module-nav.adoc | 3 -
.../outbox-publisher/partials/module-nav.adoc | 2 +-
persistence/jdo/adoc/modules/ROOT/pages/about.adoc | 11 +-
.../jdo/adoc/modules/ROOT/pages/configuring.adoc | 4 +-
.../jdo/adoc/modules/ROOT/pages/db-schemas.adoc | 3 +
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 4 +-
.../jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc | 1 +
security/adoc/modules/ROOT/pages/about.adoc | 8 +-
.../modules/ROOT/pages/usage-by-isis-viewers.adoc | 5 +-
.../src/main/adoc/modules/bypass/pages/about.adoc | 2 +-
.../main/adoc/modules/keycloak/pages/about.adoc | 2 +
.../src/main/adoc/modules/shiro/pages/about.adoc | 2 +-
.../pages/about/configuring-isis-to-use-shiro.adoc | 2 +-
.../pages/fixture-scripts/api-and-usage.adoc | 2 +-
valuetypes/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../adoc/modules/asciidoc/partials/module-nav.adoc | 2 +-
.../adoc/modules/markdown/partials/module-nav.adoc | 2 +-
.../sse/adoc/modules/sse/partials/module-nav.adoc | 2 +-
.../adoc/modules/ROOT/pages/about.adoc | 15 +-
.../adoc/modules/ROOT/pages/architecture.adoc | 49 ++---
.../ROOT/pages/configuration-properties.adoc | 4 +-
.../adoc/modules/ROOT/pages/health-check.adoc | 3 +-
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 1 +
.../adoc/modules/ROOT/pages/layout-resources.adoc | 10 +-
.../adoc/modules/ROOT/pages/ro-spec.adoc | 96 ++++-----
.../adoc/modules/ROOT/pages/security.adoc | 1 +
.../ROOT/pages/simplified-representations.adoc | 2 +-
viewers/wicket/adoc/modules/ROOT/pages/about.adoc | 5 +-
.../ROOT/pages/configuration-properties.adoc | 13 +-
.../adoc/modules/ROOT/pages/customisation.adoc | 1 +
.../wicket/adoc/modules/ROOT/pages/extending.adoc | 1 +
.../wicket/adoc/modules/ROOT/pages/features.adoc | 1 +
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 1 +
.../adoc/modules/ROOT/pages/incode-platform.adoc | 33 ----
.../wicket/adoc/modules/ROOT/pages/security.adoc | 2 +
540 files changed, 863 insertions(+), 1098 deletions(-)
copy api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples.sh (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/clock/Clock.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/clock/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/domain/DomainObjectList.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ActionArgumentUsabilityEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ActionArgumentVisibilityEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/EventObjectBase.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/domain/AbstractDomainEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/domain/ActionDomainEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/domain/CollectionDomainEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/domain/PropertyDomainEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/AbstractLifecycleEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectCreatedEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectLoadedEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectPersistedEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectPersistingEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectRemovingEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectUpdatedEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/lifecycle/ObjectUpdatingEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ui/AbstractUiEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ui/CssClassUiEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ui/IconUiEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ui/LayoutUiEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/events/ui/TitleUiEvent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/Edge.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/SimpleEdge.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/Vertex.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/LazyTreeNode.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeAdapter.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeNode.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeNode_iteratorBreadthFirst.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeNode_iteratorDepthFirst.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeNode_iteratorHierarchyUp.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreePath.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreePath_Default.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeState.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/graph/tree/TreeState_Default.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/ActionLayoutData.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/ActionLayoutDataOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/CollectionLayoutData.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/CollectionLayoutDataOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/CssClassFaPosition.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/DomainObjectLayoutData.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/DomainObjectLayoutDataOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/FieldSet.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/FieldSetOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasBookmarking.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasCssClass.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasCssClassFa.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasDescribedAs.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasHidden.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/HasNamed.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/MemberRegion.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/MemberRegionOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/Owned.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/Owner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/PropertyLayoutData.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/ServiceActionLayoutData.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/ServiceActionLayoutDataOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/component/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/Grid.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/GridAbstract.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3ClearFix.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3Col.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3Element.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3Grid.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3Row.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3RowContent.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3RowOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3Tab.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3TabGroup.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/BS3TabOwner.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/HasCssId.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/Size.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/SizeSpan.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/WithinGrid.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/grid/bootstrap3/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/links/Link.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/links/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/Menu.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/MenuBar.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/MenuBars.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/MenuBarsAbstract.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/MenuSection.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/bootstrap3/BS3Menu.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/bootstrap3/BS3MenuBar.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/bootstrap3/BS3MenuBars.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/bootstrap3/BS3MenuSection.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/menubars/bootstrap3/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/layout/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/MixinConstants.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/dto/Dto.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/dto/Dto_downloadXml.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/dto/Dto_downloadXsd.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/dto/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/layout/Object_downloadLayoutXml.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/layout/Object_openRestApi.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/layout/Object_rebuildMetamodel.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/metamodel/Object_objectIdentifier.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/metamodel/Object_objectType.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/timestamp/HoldsUpdatedAt.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/timestamp/HoldsUpdatedBy.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/timestamp/Timestampable.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/mixins/timestamp/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/AbstractSpecification.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/AbstractSpecification2.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/Specification.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/Specification2.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/SpecificationAnd.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/SpecificationNot.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/SpecificationOr.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/spec/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/Enums.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/Equality.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/Hashing.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/JaxbAdapters.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/JaxbUtil.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ObjectContract_Empty.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ObjectContract_Impl.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ObjectContract_Parser.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ObjectContracts.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ReasonBuffer.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ReasonBuffer2.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/Reasons.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/TitleBuffer.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/TitleBufferException.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ToString.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/ZipWriter.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/schema/ChangesDtoUtils.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/schema/CommandDtoUtils.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/schema/CommonDtoUtils.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/schema/InteractionDtoUtils.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/util/schema/MemberExecutionDtoUtils.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/Blob.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/Clob.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/Image.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/LocalResourcePath.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/Markup.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/NamedWithMimeType.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/Password.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/examples/value/package-info.java (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-classes/issue-in-more-detail.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-methods/prefixes/choices/dependent.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-methods/reserved/iconName/differing.pdn (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-methods/reserved/iconName/differing.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/reference-methods/reserved/iconName/png-files.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/images/value-types/markup.png (100%)
rename api/applib/src/main/adoc/modules/{applib-cm => applib-classes}/nav.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/ViewModel.adoc (100%)
copy {extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap => api/applib/src/main/adoc/modules/applib-classes}/pages/about.adoc (72%)
copy extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc => api/applib/src/main/adoc/modules/applib-classes/pages/events.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/domainevent.adoc (89%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/domainevent/AbstractDomainEvent.adoc (95%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/domainevent/ActionDomainEvent.adoc (96%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/domainevent/CollectionDomainEvent.adoc (96%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/domainevent/PropertyDomainEvent.adoc (96%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent.adoc (87%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/AbstractLifecycleEvent.adoc (64%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectCreatedEvent.adoc (80%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectLoadedEvent.adoc (85%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectPersistedEvent.adoc (79%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectPersistingEvent.adoc (79%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectRemovingEvent.adoc (79%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectUpdatedEvent.adoc (88%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/lifecycleevent/ObjectUpdatingEvent.adoc (88%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/uievent.adoc (61%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/uievent/CssClassUiEvent.adoc (88%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/uievent/IconUiEvent.adoc (90%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/events}/uievent/TitleUiEvent.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/i18n.adoc (98%)
copy api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/i18n/TranslatableString.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/rgcms.adoc => applib-classes/pages/layout.adoc} (87%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/layout}/menubars.adoc (91%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes/layout.adoc => applib-classes/pages/layout/object-layout.adoc} (99%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes/i18n/TranslatableString.adoc => applib-classes/pages/roles-mixins-contributees.adoc} (74%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/contributee.adoc (98%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/mixins.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/mixins/Dto.adoc (89%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/mixins/Object.adoc (96%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/mixins/Persistable.adoc (92%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/roles.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/roles/HoldsUpdatedAt.adoc (90%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/roles/HoldsUpdatedBy.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages/roles-mixins-contributees}/roles/Timestampable.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/spec.adoc (97%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/utility.adoc (97%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/utility/Enums.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/utility/ObjectContracts.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/utility/Reasons.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/utility/TitleBuffer.adoc (89%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/value-types.adoc (77%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/value-types/Blob.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/value-types/Clob.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/classes => applib-classes/pages}/value-types/Markup.adoc (100%)
create mode 100644 api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc
delete mode 100644 api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc
rename api/applib/src/main/adoc/modules/{applib-cm => applib-methods}/examples.sh (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/clock/Clock.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/clock/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/domain/DomainObjectList.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ActionArgumentUsabilityEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ActionArgumentVisibilityEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/EventObjectBase.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/domain/AbstractDomainEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/domain/ActionDomainEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/domain/CollectionDomainEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/domain/PropertyDomainEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/AbstractLifecycleEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectCreatedEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectLoadedEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectPersistedEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectPersistingEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectRemovingEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectUpdatedEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/lifecycle/ObjectUpdatingEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ui/AbstractUiEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ui/CssClassUiEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ui/IconUiEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ui/LayoutUiEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/events/ui/TitleUiEvent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/Edge.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/SimpleEdge.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/Vertex.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/LazyTreeNode.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeAdapter.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeNode.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeNode_iteratorBreadthFirst.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeNode_iteratorDepthFirst.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeNode_iteratorHierarchyUp.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreePath.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreePath_Default.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeState.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/graph/tree/TreeState_Default.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/ActionLayoutData.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/ActionLayoutDataOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/CollectionLayoutData.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/CollectionLayoutDataOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/CssClassFaPosition.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/DomainObjectLayoutData.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/DomainObjectLayoutDataOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/FieldSet.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/FieldSetOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasBookmarking.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasCssClass.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasCssClassFa.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasDescribedAs.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasHidden.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/HasNamed.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/MemberRegion.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/MemberRegionOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/Owned.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/Owner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/PropertyLayoutData.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/ServiceActionLayoutData.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/ServiceActionLayoutDataOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/component/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/Grid.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/GridAbstract.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3ClearFix.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3Col.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3Element.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3Grid.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3Row.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3RowContent.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3RowOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3Tab.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3TabGroup.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/BS3TabOwner.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/HasCssId.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/Size.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/SizeSpan.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/WithinGrid.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/grid/bootstrap3/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/links/Link.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/links/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/Menu.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/MenuBar.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/MenuBars.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/MenuBarsAbstract.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/MenuSection.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/bootstrap3/BS3Menu.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/bootstrap3/BS3MenuBar.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/bootstrap3/BS3MenuBars.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/bootstrap3/BS3MenuSection.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/menubars/bootstrap3/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/layout/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/MixinConstants.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/dto/Dto.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/dto/Dto_downloadXml.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/dto/Dto_downloadXsd.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/dto/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/layout/Object_downloadLayoutXml.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/layout/Object_openRestApi.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/layout/Object_rebuildMetamodel.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/metamodel/Object_objectIdentifier.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/metamodel/Object_objectType.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/timestamp/HoldsUpdatedAt.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/timestamp/HoldsUpdatedBy.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/timestamp/Timestampable.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/mixins/timestamp/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/AbstractSpecification.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/AbstractSpecification2.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/Specification.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/Specification2.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/SpecificationAnd.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/SpecificationNot.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/SpecificationOr.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/spec/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/Enums.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/Equality.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/Hashing.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/JaxbAdapters.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/JaxbUtil.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ObjectContract_Empty.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ObjectContract_Impl.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ObjectContract_Parser.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ObjectContracts.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ReasonBuffer.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ReasonBuffer2.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/Reasons.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/TitleBuffer.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/TitleBufferException.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ToString.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/ZipWriter.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/package-info.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/schema/ChangesDtoUtils.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/schema/CommandDtoUtils.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/schema/CommonDtoUtils.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/schema/InteractionDtoUtils.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/util/schema/MemberExecutionDtoUtils.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/Blob.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/Clob.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/Image.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/LocalResourcePath.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/Markup.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/NamedWithMimeType.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/Password.java (100%)
copy api/applib/src/main/{java/org/apache/isis/applib => adoc/modules/applib-methods/examples}/value/package-info.java (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-classes/issue-in-more-detail.png (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-methods/prefixes/choices/dependent.png (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-methods/reserved/iconName/differing.pdn (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-methods/reserved/iconName/differing.png (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/reference-methods/reserved/iconName/png-files.png (100%)
copy api/{schema/src/main/adoc/modules/schema => applib/src/main/adoc/modules/applib-methods}/images/value-types/markup.png (100%)
copy {core/config/src/main/adoc/modules/config => api/applib/src/main/adoc/modules/applib-methods}/nav.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods.adoc => applib-methods/pages/about.adoc} (78%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle.adoc (59%)
copy testing/unittestsupport/applib/xml/objects/CUS/2.xml => api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/loaded.adoc (89%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/persisted.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/persisting.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/removing.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/updated.adoc (83%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/lifecycle/updating.adoc (83%)
create mode 100644 api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/autoComplete.adoc (75%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/choices.adoc (82%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/default.adoc (61%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/addTo.adoc (95%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/clear.adoc (95%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/modify.adoc (96%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/removeFrom.adoc (95%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/validate.adoc (100%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/validateAddTo.adoc (92%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/prefixes => applib-methods/pages/prefixes/deprecated}/validateRemoveFrom.adoc (92%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/disable.adoc (69%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/get.adoc (95%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/hide.adoc (66%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/prefixes/set.adoc (92%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/reserved.adoc (63%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/reserved/cssClass.adoc (76%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/reserved => applib-methods/pages/reserved/deprecated}/disable.adoc (91%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/reserved => applib-methods/pages/reserved/deprecated}/getId.adoc (97%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/reserved => applib-methods/pages/reserved/deprecated}/hide.adoc (80%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods/reserved => applib-methods/pages/reserved/deprecated}/validate.adoc (98%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/reserved/iconName.adoc (84%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/reserved/layout.adoc (80%)
rename api/applib/src/main/adoc/modules/{applib-cm/pages/methods => applib-methods/pages}/reserved/title.adoc (63%)
create mode 100644 api/applib/src/main/adoc/modules/applib-methods/partials/module-nav.adoc
delete mode 100644 viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc
[isis] 02/03: ISIS-2062: refguide classes reorg
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4872bb9d432c5722c35a32847d6d247095afa453
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 27 15:47:56 2020 +0000
ISIS-2062: refguide classes reorg
---
.../modules/applib-ant/pages/XmlRootElement.adoc | 2 +-
.../adoc/modules/applib-classes/pages/about.adoc | 13 --
.../pages/{i18n.adoc => events.adoc} | 10 +-
.../pages/{ => events}/domainevent.adoc | 8 +-
.../domainevent/AbstractDomainEvent.adoc | 6 +-
.../domainevent/ActionDomainEvent.adoc | 2 +-
.../domainevent/CollectionDomainEvent.adoc | 2 +-
.../domainevent/PropertyDomainEvent.adoc | 2 +-
.../pages/{ => events}/lifecycleevent.adoc | 16 +--
.../lifecycleevent/AbstractLifecycleEvent.adoc | 14 +--
.../lifecycleevent/ObjectCreatedEvent.adoc | 2 +-
.../lifecycleevent/ObjectLoadedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistingEvent.adoc | 2 +-
.../lifecycleevent/ObjectRemovingEvent.adoc | 2 +-
.../lifecycleevent/ObjectUpdatedEvent.adoc | 2 +-
.../lifecycleevent/ObjectUpdatingEvent.adoc | 2 +-
.../applib-classes/pages/{ => events}/uievent.adoc | 23 +++-
.../{ => events}/uievent/CssClassUiEvent.adoc | 0
.../pages/{ => events}/uievent/IconUiEvent.adoc | 0
.../pages/{ => events}/uievent/TitleUiEvent.adoc | 0
.../adoc/modules/applib-classes/pages/i18n.adoc | 1 +
.../adoc/modules/applib-classes/pages/layout.adoc | 137 +--------------------
.../pages/{ => layout}/menubars.adoc | 0
.../{layout.adoc => layout/object-layout.adoc} | 3 +-
.../{i18n.adoc => roles-mixins-contributees.adoc} | 11 +-
.../contributee.adoc | 11 +-
.../{ => roles-mixins-contributees}/mixins.adoc | 0
.../mixins/Dto.adoc | 0
.../mixins/Object.adoc | 0
.../mixins/Persistable.adoc | 0
.../{ => roles-mixins-contributees}/roles.adoc | 0
.../roles/HoldsUpdatedAt.adoc | 0
.../roles/HoldsUpdatedBy.adoc | 0
.../roles/Timestampable.adoc | 0
.../adoc/modules/applib-classes/pages/spec.adoc | 11 +-
.../adoc/modules/applib-classes/pages/utility.adoc | 2 +-
.../modules/applib-classes/pages/value-types.adoc | 29 ++---
.../applib-classes/partials/module-nav.adoc | 10 +-
.../modules/applib-methods/pages/lifecycle.adoc | 14 +--
40 files changed, 95 insertions(+), 246 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
index c531a73..c89c52b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
@@ -11,7 +11,7 @@ In the case of a JAXB-annotated object this memento is its XML representation.
JAXB generally requires that the root element of the XML representation is annotated with `@XmlRootElement`.
Apache Isis makes this a mandatory requirement.
-In comparison to using either the xref:applib-classes:about.adoc#ViewModel[`ViewModel`] interface or the xref:refguide:applib-ant:ViewModel.adoc[`@ViewModel`] annotation, using `@XmlRootElement` has a couple of significant advantages:
+In comparison to using either the xref:applib-classes:ViewModel.adoc[`ViewModel`] interface or the xref:refguide:applib-ant:ViewModel.adoc[`@ViewModel`] annotation, using `@XmlRootElement` has a couple of significant advantages:
* the view model can be used as a "canonical" DTO, for example when accessing data using the xref:vro:ROOT:about.adoc[RestfulObjects viewer] in combination with the
xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
index df7cb3e..6bec8d8 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
@@ -8,16 +8,3 @@ This chapter describes the usage of various classes and interfaces that are not
-include::ViewModel.adoc[leveloffset=+1]
-include::domainevent.adoc[leveloffset=+1]
-include::uievent.adoc[leveloffset=+1]
-include::lifecycleevent.adoc[leveloffset=+1]
-include::value-types.adoc[leveloffset=+1]
-include::utility.adoc[leveloffset=+1]
-include::spec.adoc[leveloffset=+1]
-include::i18n.adoc[leveloffset=+1]
-include::contributee.adoc[leveloffset=+1]
-include::roles.adoc[leveloffset=+1]
-include::mixins.adoc[leveloffset=+1]
-include::layout.adoc[leveloffset=+1]
-include::menubars.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events.adoc
similarity index 81%
copy from api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
copy to api/applib/src/main/adoc/modules/applib-classes/pages/events.adoc
index b57f81c..386fc42 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events.adoc
@@ -1,10 +1,8 @@
-= i18n support
+= Events
: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 [...]
-:page-partial:
-The `org.apache.isis.applib.services.i18n` package contains a single class to support i18n.
-
-
-include::i18n/TranslatableString.adoc[leveloffset=+1]
+include::events/domainevent.adoc[leveloffset=+1]
+include::events/uievent.adoc[leveloffset=+1]
+include::events/lifecycleevent.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
similarity index 90%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
index 4dbe954..6cde0ee 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
@@ -20,20 +20,20 @@ They are listed in the table below.
|Notes
-|xref:applib-classes:about.adoc#AbstractDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#AbstractDomainEvent[`o.a.i.applib.` +
`AbstractDomainEvent`]
|(abstract class)
|Superclass of the other domain events, listed below in this table.
-|xref:applib-classes:about.adoc#ActionDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ActionDomainEvent[`o.a.i.applib.` +
`ActionDomainEvent`]
|(abstract class). +
`ActionDomainEvent.Default` is the concrete implementation used if no `@Action#domainEvent` attribute is specified
|Broadcast whenever there is an interaction (hide/disable/validate/pre-execute/post-execute) with an object's action.
-|xref:applib-classes:about.adoc#CollectionDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#CollectionDomainEvent[`o.a.i.applib.` +
`CollectionDomainEvent`]
|(abstract class). +
`CollectionDomainEvent.Default` is the concrete implementation used if no `@Collection#domainEvent` attribute
@@ -41,7 +41,7 @@ is specified.
|Broadcast whenever there is an interaction (hide/disable/validate/access) with an object's collection.
-|xref:applib-classes:about.adoc#PropertyDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#PropertyDomainEvent[`o.a.i.applib.` +
`PropertyDomainEvent`]
|(abstract class). +
`PropertyDomainEvent.Default` is the concrete implementation used if no `@Propert#domainEvent` attribute is specified
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/AbstractDomainEvent.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/AbstractDomainEvent.adoc
index b3524e5..942e79e 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/AbstractDomainEvent.adoc
@@ -9,9 +9,9 @@ This class is the superclass for all domain events that are raised by the framew
Its immediate subclasses are:
-* xref:applib-classes:about.adoc#ActionDomainEvent[`ActionDomainEvent`]
-* xref:applib-classes:about.adoc#PropertyDomainEvent[`PropertyDomainEvent`]
-* xref:applib-classes:about.adoc#CollectionDomainEvent[`CollectionDomainEvent`]
+* xref:applib-classes:events.adoc#ActionDomainEvent[`ActionDomainEvent`]
+* xref:applib-classes:events.adoc#PropertyDomainEvent[`PropertyDomainEvent`]
+* xref:applib-classes:events.adoc#CollectionDomainEvent[`CollectionDomainEvent`]
The main purpose of the class is to define the protocol by which subscribers can influence an interaction (eg hide a collection, disable a property, validate action arguments).
It class also provides a simple mechanism to allow adhoc sharing of user data between different phases.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
similarity index 97%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
index 18edd1c..53f9f77 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for actions.
+Subclass of xref:applib-classes:events.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for actions.
The class has a number of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
index f35e55b..d6fa5d8 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for collections.
+Subclass of xref:applib-classes:events.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for collections.
The class has a couple of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
index ab19ca4..537b298 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for properties.
+Subclass of xref:applib-classes:events.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for properties.
The class has a couple of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
similarity index 88%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
index 4af197f..230c771 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
@@ -20,13 +20,13 @@ The lifecycle event classes are listed in the table below:
|Notes
-|xref:applib-classes:about.adoc#AbstractLifecycleEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#AbstractLifecycleEvent[`o.a.i.applib.` +
`AbstractLifecycleEvent`]
|(abstract class)
|Superclass of the other lifecycle events, listed below in this table.
-|xref:applib-classes:about.adoc#ObjectCreatedEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectCreatedEvent[`o.a.i.applib.` +
`ObjectCreatedEvent`]
|(abstract class). +
`ObjectCreatedEvent.Default` is the concrete implementation that is used.
@@ -34,14 +34,14 @@ The lifecycle event classes are listed in the table below:
`#instantiate(...)` method.
-|xref:applib-classes:about.adoc#ObjectLoadedEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectLoadedEvent[`o.a.i.applib.` +
`ObjectLoadedEvent`]
|(abstract class). +
`ObjectLoadedEvent.Default` is the concrete implementation that is used.
|Broadcast when an object is retrieved from the database.
-|xref:applib-classes:about.adoc#ObjectPersistedEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectPersistedEvent[`o.a.i.applib.` +
`ObjectPersistedEvent`]
|(abstract class). +
`ObjectPersistedEvent.Default` is the concrete implementation that is used.
@@ -49,7 +49,7 @@ The lifecycle event classes are listed in the table below:
`#persist(...)` method.
-|xref:applib-classes:about.adoc#ObjectPersistingEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectPersistingEvent[`o.a.i.applib.` +
`ObjectPersistingEvent`]
|(abstract class). +
`ObjectPersistingEvent.Default` is the concrete implementation that is used.
@@ -57,7 +57,7 @@ The lifecycle event classes are listed in the table below:
`#persist(...)` method.
-|xref:applib-classes:about.adoc#ObjectRemovingEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectRemovingEvent[`o.a.i.applib.` +
`ObjectRemovingEvent`]
|(abstract class). +
`ObjectRemovingEvent.Default` is the concrete implementation that is used.
@@ -65,7 +65,7 @@ The lifecycle event classes are listed in the table below:
`#remove(...)` method.
-|xref:applib-classes:about.adoc#ObjectUpdatedEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectUpdatedEvent[`o.a.i.applib.` +
`ObjectUpdatedEvent`]
|(abstract class). +
`ObjectUpdatedEvent.Default` is the concrete implementation that is used.
@@ -73,7 +73,7 @@ The lifecycle event classes are listed in the table below:
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
-|xref:applib-classes:about.adoc#ObjectUpdatingEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#ObjectUpdatingEvent[`o.a.i.applib.` +
`ObjectUpdatingEvent`]
|``o.a.i.core`` +
``events.lifecycle`` +
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 65%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/AbstractLifecycleEvent.adoc
index 916a36d..079c6d5 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/AbstractLifecycleEvent.adoc
@@ -9,12 +9,12 @@ This class is the superclass for all lifecycle events that are raised by the fra
Its immediate subclasses are:
-* xref:applib-classes:about.adoc#ObjectCreatedEvent[`ObjectCreatedEvent`]
-* xref:applib-classes:about.adoc#ObjectLoadedEvent[`ObjectLoadedEvent`]
-* xref:applib-classes:about.adoc#ObjectPersistedEvent[`ObjectPersistedEvent`]
-* xref:applib-classes:about.adoc#ObjectPersistingEvent[`ObjectPersistingEvent`]
-* xref:applib-classes:about.adoc#ObjectRemovingEvent[`ObjectRemovingEvent`]
-* xref:applib-classes:about.adoc#ObjectUpdatedEvent[`ObjectUpdatedEvent`]
-* xref:applib-classes:about.adoc#ObjectUpdatingEvent[`ObjectUpdatingEvent`]
+* xref:applib-classes:events.adoc#ObjectCreatedEvent[`ObjectCreatedEvent`]
+* xref:applib-classes:events.adoc#ObjectLoadedEvent[`ObjectLoadedEvent`]
+* xref:applib-classes:events.adoc#ObjectPersistedEvent[`ObjectPersistedEvent`]
+* xref:applib-classes:events.adoc#ObjectPersistingEvent[`ObjectPersistingEvent`]
+* xref:applib-classes:events.adoc#ObjectRemovingEvent[`ObjectRemovingEvent`]
+* xref:applib-classes:events.adoc#ObjectUpdatedEvent[`ObjectUpdatedEvent`]
+* xref:applib-classes:events.adoc#ObjectUpdatingEvent[`ObjectUpdatingEvent`]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 81%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
index a12cc6e..0f958e0 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib-svc:FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib-svc:FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
`ObjectCreatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 85%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectLoadedEvent.adoc
index 4a15079..5260736 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectLoadedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is retrieved from the database.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is retrieved from the database.
`ObjectLoadedEvent.Default` is the concrete implementation that is used.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
index bb6968e..393be91 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
`ObjectPersistedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
index 4438c5e..051e105 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
`ObjectPersistingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
index 93a6052..07b7dcd 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
`ObjectRemovingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
index 401c0e7..45d2819 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object has just been updated in the database.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object has just been updated in the database.
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
`ObjectUpdatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
index febd85c..bb19f14 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be updated in the database.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be updated in the database.
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
similarity index 61%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
index fa812fe..9e8549b 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
@@ -20,23 +20,34 @@ They are listed in the table below.
|Notes
-|xref:applib-classes:about.adoc#TitleUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#TitleUiEvent[`o.a.i.applib.` +
`TitleUiEvent`]
|(abstract class). +
`TitleUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#titleUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain a title for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
+|Broadcast whenever there is a requirement to obtain a title for a domain object.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
-|xref:applib-classes:about.adoc#IconUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#IconUiEvent[`o.a.i.applib.` +
`IconUiEvent`]
|(abstract class). +
`IconUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#iconUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain an icon (or rather, the name of an icon) for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
+|Broadcast whenever there is a requirement to obtain an icon (or rather, the name of an icon) for a domain object.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
-|xref:applib-classes:about.adoc#CssClassUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:events.adoc#CssClassUiEvent[`o.a.i.applib.` +
`CssClassUiEvent`]
|(abstract class). +
`CssClassUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#cssClassUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain a CSS class hint for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`] supporting method then this
+|Broadcast whenever there is a requirement to obtain a CSS class hint for a domain object.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`] supporting method then this
+will take precedence.
+
+|xref:applib-classes:events.adoc#LayoutUiEvent[`o.a.i.applib.` +
+`LayoutUiEvent`]
+|(abstract class). +
+`LayoutUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#layoutUiEvent` attribute is specified
+|Broadcast whenever there is a requirement to obtain an alternative layout for a domain object.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#layout[`layout()`] supporting method then this
will take precedence.
|===
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/CssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/CssClassUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/uievent/CssClassUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/CssClassUiEvent.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/IconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/uievent/IconUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/TitleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/uievent/TitleUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
index b57f81c..f5cacea 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
@@ -1,3 +1,4 @@
+[#i18n-support]
= i18n support
: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 [...]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
index e9c3809..53deec6 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
@@ -1,138 +1,7 @@
-= (Object) Layout
+= Layout
: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 [...]
-:page-partial:
-The `org.apache.isis.applib.layout.grid` and `org.apache.isis.applib.layout.component` packages together define a number of classes that allow the layout of domain objects (entities and view models) to be customized.
-These classes fall into two main categories:
-
-* grid classes, that define a grid structure of rows, columns, tab groups and tabs, and;
-
-* common component classes, that capture the layout metadata for an object's properties, collections and actions.
-These are bound (or associated) to the regions of the grid
-
-The framework provides an implementation of the grid classes modelled closely on link:http://getbootstrap.com[Bootstrap 3], along with xref:vw:ROOT:about.adoc[Wicket viewer] components capable of rendering that grid system.
-In principle it is also possible to extend the layout architecture for other grid systems.
-The component classes, though, are intended to be reusable across all grid systems.
-
-The component classes, meanwhile, are broadly equivalent to the "layout" annotations (xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] and xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`]
-
-All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (the `component` classes in the `http://isis.apache.org/applib/layout/component` XSD namespace, the bootstrap 3 grid classes in the `http://isis.apache.org/applib/layout/grid/bootstrap3` XSD namespace).
-This ability to serialize to/from XML is used by the xref:refguide:applib-svc:GridLoaderService.adoc[`GridLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
-It also allows the grid to be exposed through the REST API provided by the xref:vro:ROOT:about.adoc[Restful Objects viewer], as either XML or JSON.
-
-The various components (properties, collections, actions and domain object) also allow a link to be associated with each.
-These links are populated by the framework automatically when exposing the object layout grid through the REST API, pointing back to the standard Restful Objects resources.
-This design greatly assists in the implementation of generic REST clients.
-
-
-[#component]
-== Component
-
-The component classes reside in the `org.apache.isis.applib.layout.component` package, and consist of:
-
-* `FieldSet` +
-+
-A fieldset (sometimes also called a property group or member group) of a number of the domain object's properties (along with any associationed actions of those properties).
-
-* layout data classes, which correspond to the similarly named annotations:
-
-** `PropertyLayoutData`, corresponding to the xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`] annotation;
-
-** `CollectionLayoutData`, corresponding to the xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] annotation;
-
-** `ActionLayoutData`, corresponding to the xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] annotation;
-
-** `DomainObjectLayoutData`, corresponding to the xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] annotation.
-
-In addition, the component package includes `Grid`, representing the top level container for a custom layout for a domain object.
-`Grid` itself is merely an interface, but it also defines the visitor pattern to make it easy for validate and normalize the grid layouts.
-The `GridAbstract` convenience superclass provides a partial implementation of this visitor pattern.
-
-The XSD for these classes is available at link:http://isis.apache.org/applib/layout/component/component.xsd[].
-
-
-== Bootstrap3 Grid
-
-The bootstrap3 grid classes are modelled closely on link:http://getbootstrap.com[Bootstrap 3].
-Bootstrap's link:http://getbootstrap.com/css/#grid[grid system] divides the page width equally into 12 columns, and so each column spans 1 or more of these widths.
-Thus, a column with a span of 12 is the full width, one with a span of 6 is half the width, one with a span of 4 is a third of the width, and so on.
-
-When specifying the span of a column, Bootstrap also allows a size to be specified (`XS`, `SM`, `MD`, `LG`).
-The size determines the rules for responsive design.
-Apache Isis defaults to `MD` but this can be overridden.
-It is also possible to specify multiple size/spans for a given column.
-
-The grid classes provided by Apache Isis reside in the `org.apache.isis.applib.layout.grid.bootstrap3` package, and consist of:
-
-* `BS3Grid` +
-+
-Consists of a number of ``BS3Row``s.
-+
-This class is the concrete implementation of `Grid` interface, discussed previously.
-As such, it extends the `Grid.Visitor` to iterate over all of the ``Row``s of the grid.
-
-* `BS3Row` +
-+
-A container of ``BS3Col``s.
-This element is rendered as `<div class="row">`.
-
-* `BS3Col` +
-+
-A container of almost everything else.
-A column most commonly contains properties (grouped into ``FieldSet``s, described above) or collections (specified by ``CollectionLayoutData``, also above).
-However, a `Col` might instead contain a ``BS3TabGroup`` (described below) in order that the object members is arranged into tabs.
-+
-It is also possible for a ``Col`` to contain the object's title/icon (using ``DomainObjectLayoutData``) or indeed arbitrary actions (using ``ActionLayoutData`).
-+
-Finally, a ``BS3Col`` can also contain other ``BS3Row``s, allowing arbitrarily deep hierarchies of containers as required.
-+
-This element is rendered as, for example, `<div class="col-md-4">` (for a size `MD`, span of 4).
-
-* `BS3TabGroup` +
-+
-A container of ``BS3Tab``s.
-
-* `BS3Tab` +
-+
-A container of ``BS3Row``s, which will in turn contain ``BS3Col``s and thence ultimately the object's members.
-
-There are also two close cousins of `Col`, namely `ClearFixVisible` and `ClearFixHidden`.
-These map to Bootstrap's link:http://getbootstrap.com/css/#responsive-utilities[responsive utility class]es, and provide greater control for responsive designs.
-
-As you can probably guess, the `BS3Grid` is the top-level object (that is, it is JAXB `@XmlRootElement`); this is the object that is serialized to/from XML.
-
-All of these classes also allow custom CSS to be specified; these are added to the CSS classes for the corresponding `<div`> in the rendered page.
-The xref:vw:ROOT:customisation.adoc#tweaking-css-classes[`application.css`] file can then be used for application-specific CSS, allowing arbitrary fine-tuning of the layout of the page.
-
-The XSD for these classes is available at link:http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd[].
-
-
-== Link
-
-The link classes reside in the `org.apache.isis.applib.layout.links` package, and consist of just the `Link` class:
-
-[source,java]
-----
-import lombok.Getter;
-
-public class Link {
- @Getter
- private String rel; // <.>
- @Getter
- private String method; // <.>
- @Getter
- private String href; // <.>
- @Getter
- private String type; // <.>
- ...
-}
-----
-<.> a "rel" (as defined by section 2.7.1.2 of the RO spec v1.0), identifying the nature of the link.
-<.> the HTTP method to access the link.
-This is always "GET".
-<.> The (absolute) URL to access the Restful Objects resource.
-<.> The media type (`Accept` header) that will be returned by the URL.
-
-The XSD for these classes is available at link:http://isis.apache.org/applib/layout/links/links.xsd[].
+include::layout/object-layout.adoc[leveloffset=+1]
+include::layout/menubars.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/menubars.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/menubars.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
similarity index 99%
copy from api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
copy to api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
index e9c3809..e0e9a0d 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
@@ -1,4 +1,5 @@
-= (Object) Layout
+[#object-layout]
+= Object Layout
: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 [...]
:page-partial:
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees.adoc
similarity index 74%
copy from api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
copy to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees.adoc
index b57f81c..332c235 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees.adoc
@@ -1,10 +1,9 @@
-= i18n support
+[#roles-mixins-and-contributees]
+= Roles, Mixins and Contributees
: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 [...]
-:page-partial:
-The `org.apache.isis.applib.services.i18n` package contains a single class to support i18n.
-
-
-include::i18n/TranslatableString.adoc[leveloffset=+1]
+include::roles-mixins-contributees/roles.adoc[leveloffset=+1]
+include::roles-mixins-contributees/mixins.adoc[leveloffset=+1]
+include::roles-mixins-contributees/contributee.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/contributee.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
similarity index 98%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/contributee.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
index 56fed30..ceb933a 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/contributee.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
@@ -6,15 +6,11 @@
The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces.
-
-
[[HasUniqueId]]
== `HasUniqueId`
-
The `HasUniqueId` interface is a mix-in for any domain objects that reference a transaction id, such as auditing entries or commands, or for xref:refguide:applib-svc:InteractionContext.adoc[`Interaction`]s persisted as published events.
-
[NOTE]
====
This identifier actually is for the request/interaction in which the object was created, so is actually now mis-named.
@@ -25,11 +21,11 @@ The interface is defined is:
[source,java]
----
public interface HasUniqueId {
- public UUID getTransactionId(); // <1>
+ public UUID getTransactionId(); // <.>
public void setTransactionId(final UUID transactionId);
}
----
-<1> unique identifier (a GUID) of this request/interaction.
+<.> unique identifier (a GUID) of this request/interaction.
Some of the extension/mapping modules that have domain entity/ies that implement this interface are:
@@ -57,12 +53,9 @@ The purpose of this interface is to allow mixins to be defined, though the frame
Currently the only implementation of this interface is that for `PublishedObjects` applib interface as defined by the xref:refguide:applib-svc:PublisherService.adoc[`PublisherService`].
-
-
[[HasUserName]]
== `HasUsername`
-
The `HasUsername` interface is a mix-in for domain objects to be associated with a username.
Other services and modules can then contribute actions/collections to render such additional information relating to the activities of the user.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/mixins.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/mixins.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Dto.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Dto.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Object.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Object.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Persistable.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Persistable.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Persistable.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Persistable.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/roles.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedAt.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedAt.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedBy.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedBy.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedBy.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedBy.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles/Timestampable.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/Timestampable.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-classes/pages/roles/Timestampable.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/Timestampable.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
index 019965e..d593843 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
@@ -1,3 +1,4 @@
+[#specification-pattern]
= Specification pattern
: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 [...]
@@ -8,8 +9,6 @@ The interfaces and classes listed in this chapter provide support for the `Spec
Apache Isis will automatically apply such specifications as validation rules on properties (as per xref:refguide:applib-ant:Property.adoc#mustSatisfy[`@Property#mustSatisfy()`]) and on action parameters (as per xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]).
-
-
[#specification]
== `Specification`
@@ -23,7 +22,6 @@ public interface Specification {
----
<1> if returns `null`, then the constraint is satisfies; otherwise returns the reason why the constraint has not been satisfied.
-
For example:
[source,java]
@@ -46,8 +44,6 @@ public class Customer {
----
<1> this ugly cast can be avoided using some of the other classes available; see below.
-
-
== `Specification2`
The `Specification2` interface extends the `Specification` API to add support for i18n.
@@ -61,12 +57,8 @@ public interface Specification2 extends Specification {
----
<1> if returns `null`, then the constraint is satisfies; otherwise returns the reason why the constraint has not been satisfied.
-
Note that if implementing `Specification2` then there is no need to also provide an implementation of the inherited `satisfies(Object)` method; this will never be called by the framework for `Specification2` instances.
-
-
-
== Adapter classes
The `AbstractSpecification` and `AbstractSpecification2` adapter classes provide a partial implementation of the respective interfaces, providing type-safety.
@@ -94,7 +86,6 @@ public class Customer {
The `AbstractSpecification2` class is almost identical; its type-safe method is `satisfiesTranslatableSafely(T)` instead.
-
== Combining specifications
There are also adapter classes that can be inherited from to combine specifications:
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
index ed49457..ee47dca 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
@@ -1,4 +1,4 @@
-= Applib Utility Classes
+= Utility 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 [...]
:page-partial:
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc
index 84f364f..2cbf601 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc
@@ -1,9 +1,12 @@
+[#value-types]
= Value Types
: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 [...]
:page-partial:
+== Built-in
+
Apache Isis can render and persist all of the JDK primitives and wrapper classes, and a number of other JDK (7.x) classes that represent value types.
It also supports some of the link:http://www.joda.org/joda-time/[Joda-Time] datatypes, and a number of value types that are shipped by the framework itself.
@@ -28,29 +31,19 @@ In addition to primitives, the JDK Classes supported are:
** `java.sql.Timestamp`
** `java.util.Date`
-It supports these Joda-Time classes:
+
+== Joda Time
+
+It also supports these Joda-Time classes:
* `org.joda.time.DateTime`
* `org.joda.time.LocalDateTime`
* `org.joda.time.LocalDate`
-The value types defined by the framework itself (in the applib) are:
-
-* `o.a.i.applib.value.Blob`
-+
-binary large object, eg PDFs or images
-
-* `o.a.i.applib.value.Markup`
-+
-Intended for use as a read-only property to display arbitrary HTML.
-
-* `o.a.i.applib.value.Clob`
-+
-character large objects, eg XML
-
+== Apache Isis-defined
-include::value-types/Blob.adoc[leveloffset=+1]
-include::value-types/Clob.adoc[leveloffset=+1]
-include::value-types/Markup.adoc[leveloffset=+1]
+include::value-types/Blob.adoc[leveloffset=+2]
+include::value-types/Clob.adoc[leveloffset=+2]
+include::value-types/Markup.adoc[leveloffset=+2]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
index 12a839a..387cd00 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
@@ -1,6 +1,12 @@
-
-
* xref:applib-classes:about.adoc[Classes]
+** xref:applib-classes:events.adoc[Events]
+** xref:applib-classes:ViewModel.adoc[`ViewModel`]
+** xref:applib-classes:value-types.adoc[Value Types]
+** xref:applib-classes:spec.adoc[Specification pattern]
+** xref:applib-classes:i18n.adoc[i18n support]
+** xref:applib-classes:roles-mixins-contributees.adoc[Roles, Mixins and Contributees]
+** xref:applib-classes:utility.adoc[Utility Classes]
+** xref:applib-classes:layout.adoc[Layout]
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
index ba0349d..6a8f927 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
@@ -21,31 +21,31 @@ equivalent
|created()
|called when an object has just been created using xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(..)`] or xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]
-|xref:applib-classes:about.adoc#ObjectCreatedEvent[ObjectCreatedEvent]
+|xref:applib-classes:events.adoc#ObjectCreatedEvent[ObjectCreatedEvent]
|loaded()
|called when a (persistent) object has just been loaded from the object store.
-|xref:applib-classes:about.adoc#ObjectLoadedEvent[ObjectLoadedEvent]
+|xref:applib-classes:events.adoc#ObjectLoadedEvent[ObjectLoadedEvent]
|persisted()
|called when object has just been persisted from the object store.
-|xref:applib-classes:about.adoc#ObjectPersistedEvent[ObjectPersistedEvent]
+|xref:applib-classes:events.adoc#ObjectPersistedEvent[ObjectPersistedEvent]
|persisting()
|called when a (not-yet-persistent) object is just about to be persisted from the object store
-|xref:applib-classes:about.adoc#ObjectPersistingEvent[ObjectPersistingEvent]
+|xref:applib-classes:events.adoc#ObjectPersistingEvent[ObjectPersistingEvent]
|removing()
|called when a (persistent) object is just about to be deleted from the object store
-|xref:applib-classes:about.adoc#ObjectRemovingEvent[ObjectRemovingEvent]
+|xref:applib-classes:events.adoc#ObjectRemovingEvent[ObjectRemovingEvent]
|updated()
|called when a (persistent) object has just been updated in the object store
-|xref:applib-classes:about.adoc#ObjectUpdatedEvent[ObjectUpdatedEvent]
+|xref:applib-classes:events.adoc#ObjectUpdatedEvent[ObjectUpdatedEvent]
|updating()
|called when a (persistent) object is just about to be updated in the object store
-|xref:applib-classes:about.adoc#ObjectUpdatingEvent[ObjectUpdatingEvent]
+|xref:applib-classes:events.adoc#ObjectUpdatingEvent[ObjectUpdatingEvent]
|===
[isis] 03/03: ISIS-2062: adds TODOs for stuff still, well, todo
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 06a43ce2d4fe9e44c4e8697b1e93368027bec091
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 27 16:44:42 2020 +0000
ISIS-2062: adds TODOs for stuff still, well, todo
---
.../components/docs/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/pages/landing-page/releases.adoc | 2 +-
.../modules/ROOT/partials/module-nav/releases.adoc | 2 +-
.../applib-classes/pages/layout/menubars.adoc | 1 +
.../applib-svc/pages/ConfigurationViewService.adoc | 3 +-
.../applib-svc/pages/ContentMappingService.adoc | 2 +-
.../modules/applib-svc/pages/DeepLinkService.adoc | 2 +-
.../applib-svc/pages/EmailNotificationService.adoc | 2 +-
.../modules/applib-svc/pages/EmailService.adoc | 3 +-
.../applib-svc/pages/ErrorReportingService.adoc | 2 +-
.../modules/applib-svc/pages/EventBusService.adoc | 4 +-
.../applib-svc/pages/ExceptionRecognizer.adoc | 2 +-
.../pages/ExceptionRecognizerService.adoc | 2 +-
.../modules/applib-svc/pages/FactoryService.adoc | 7 +-
.../applib-svc/pages/GridLoaderService.adoc | 3 +-
.../adoc/modules/applib-svc/pages/GridService.adoc | 2 +-
.../applib-svc/pages/GridSystemService.adoc | 2 +-
.../adoc/modules/applib-svc/pages/HintStore.adoc | 2 +-
.../applib-svc/pages/InteractionContext.adoc | 2 +-
.../adoc/modules/applib-svc/pages/JaxbService.adoc | 2 +
.../modules/applib-svc/pages/LayoutService.adoc | 3 +
.../applib-svc/pages/LayoutServiceMenu.adoc | 1 +
.../modules/applib-svc/pages/LocaleProvider.adoc | 1 +
.../applib-svc/pages/MenuBarsLoaderService.adoc | 3 +-
.../modules/applib-svc/pages/MenuBarsService.adoc | 5 +-
.../modules/applib-svc/pages/MessageService.adoc | 1 +
.../modules/applib-svc/pages/MetaModelService.adoc | 1 +
.../applib-svc/pages/MetaModelServiceMenu.adoc | 2 +
.../modules/applib-svc/pages/MetricsService.adoc | 1 +
.../modules/applib-svc/pages/PublisherService.adoc | 3 +-
.../applib-svc/pages/QueryResultsCache.adoc | 3 +-
.../applib-svc/pages/QueryResultsCacheControl.adoc | 2 +
.../applib-svc/pages/RepositoryService.adoc | 2 +-
.../modules/applib-svc/pages/RoutingService.adoc | 3 +-
.../adoc/modules/applib-svc/pages/Scratchpad.adoc | 4 +-
.../modules/applib-svc/pages/ServiceInjector.adoc | 3 +-
.../modules/applib-svc/pages/ServiceRegistry.adoc | 4 +-
.../applib-svc/pages/SessionLoggingService.adoc | 1 +
.../adoc/modules/applib-svc/pages/SudoService.adoc | 3 +-
.../modules/applib-svc/pages/SwaggerService.adoc | 3 +-
.../applib-svc/pages/TableColumnOrderService.adoc | 3 +-
.../modules/applib-svc/pages/TitleService.adoc | 4 +-
.../applib-svc/pages/TransactionService.adoc | 4 +-
.../applib-svc/pages/TranslationService.adoc | 1 +
.../applib-svc/pages/TranslationsResolver.adoc | 2 +-
.../applib-svc/pages/UrlEncodingService.adoc | 2 +-
.../applib-svc/pages/UserProfileService.adoc | 2 +-
.../applib-svc/pages/UserRegistrationService.adoc | 2 +-
.../adoc/modules/applib-svc/pages/UserService.adoc | 2 +-
.../modules/applib-svc/pages/WrapperFactory.adoc | 7 +-
.../applib-svc/pages/XmlSnapshotService.adoc | 1 +
.../src/main/adoc/modules/core/pages/about.adoc | 2 +-
.../adoc/modules/audit-trail/pages/about.adoc | 3 +-
.../secman/adoc/modules/secman/pages/about.adoc | 2 +
.../adoc/modules/session-log/pages/about.adoc | 2 +-
.../adoc/modules/shiro-realm-ldap/pages/about.adoc | 6 +-
.../vro/cors/adoc/modules/cors/pages/about.adoc | 4 +-
.../adoc/modules/cors/partials/module-nav.adoc | 5 +-
.../adoc/modules/exceldownload/pages/about.adoc | 3 +-
.../adoc/modules/fullcalendar/pages/about.adoc | 3 +-
.../vw/gmap3/adoc/modules/gmap3/pages/about.adoc | 3 +-
.../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc | 3 +-
.../src/main/adoc/modules/model/pages/about.adoc | 3 +-
.../adoc/modules/microprofile/pages/about.adoc | 3 +-
legacy/adoc/modules/ROOT/nav.adoc | 2 +-
.../adoc/modules/ROOT/partials/component-nav.adoc | 2 -
.../src/main/adoc/modules/applib/pages/about.adoc | 2 +-
.../adoc/modules/applib/partials/module-nav.adoc | 3 -
.../src/main/adoc/modules/commons/pages/about.adoc | 3 +-
.../adoc/modules/commons/partials/module-nav.adoc | 3 -
.../src/main/adoc/modules/runtime/pages/about.adoc | 3 +-
.../adoc/modules/runtime/partials/module-nav.adoc | 3 -
.../main/adoc/modules/restclient/pages/about.adoc | 3 +-
.../modules/restclient/partials/module-nav.adoc | 3 -
.../main/adoc/modules/servletapi/pages/about.adoc | 3 +-
.../modules/servletapi/partials/module-nav.adoc | 3 -
.../outbox-publisher/partials/module-nav.adoc | 2 +-
persistence/jdo/adoc/modules/ROOT/pages/about.adoc | 11 +--
.../jdo/adoc/modules/ROOT/pages/configuring.adoc | 4 +-
.../jdo/adoc/modules/ROOT/pages/db-schemas.adoc | 3 +
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 4 +-
.../jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc | 1 +
security/adoc/modules/ROOT/pages/about.adoc | 8 +-
.../modules/ROOT/pages/usage-by-isis-viewers.adoc | 5 +-
.../src/main/adoc/modules/bypass/pages/about.adoc | 2 +-
.../main/adoc/modules/keycloak/pages/about.adoc | 2 +
.../src/main/adoc/modules/shiro/pages/about.adoc | 2 +-
.../pages/about/configuring-isis-to-use-shiro.adoc | 2 +-
valuetypes/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../adoc/modules/asciidoc/partials/module-nav.adoc | 2 +-
.../adoc/modules/markdown/partials/module-nav.adoc | 2 +-
.../sse/adoc/modules/sse/partials/module-nav.adoc | 2 +-
.../adoc/modules/ROOT/pages/about.adoc | 15 ++--
.../adoc/modules/ROOT/pages/architecture.adoc | 49 ++++-------
.../ROOT/pages/configuration-properties.adoc | 4 +-
.../adoc/modules/ROOT/pages/health-check.adoc | 3 +-
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 1 +
.../adoc/modules/ROOT/pages/layout-resources.adoc | 10 +--
.../adoc/modules/ROOT/pages/ro-spec.adoc | 96 ++++++++--------------
.../adoc/modules/ROOT/pages/security.adoc | 1 +
.../ROOT/pages/simplified-representations.adoc | 2 +-
viewers/wicket/adoc/modules/ROOT/pages/about.adoc | 5 +-
.../ROOT/pages/configuration-properties.adoc | 13 +--
.../adoc/modules/ROOT/pages/customisation.adoc | 1 +
.../wicket/adoc/modules/ROOT/pages/extending.adoc | 1 +
.../wicket/adoc/modules/ROOT/pages/features.adoc | 1 +
.../adoc/modules/ROOT/pages/hints-and-tips.adoc | 1 +
.../adoc/modules/ROOT/pages/incode-platform.adoc | 33 --------
.../wicket/adoc/modules/ROOT/pages/security.adoc | 2 +
109 files changed, 198 insertions(+), 297 deletions(-)
diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index 5546611..d460b2b 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -119,7 +119,7 @@ _Nightly Builds (not ASF)_
* link:https://github.com/apache-isis-committers/isis-nightly[CI]
* link:https://repo.incode.cloud/[Maven Repo]
-* link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
+* link:https://apache-isis-committers.github.io/isis-nightly[Website preview]
|
diff --git a/antora/components/docs/modules/ROOT/pages/landing-page/releases.adoc b/antora/components/docs/modules/ROOT/pages/landing-page/releases.adoc
index 107edd9..c0e9e87 100644
--- a/antora/components/docs/modules/ROOT/pages/landing-page/releases.adoc
+++ b/antora/components/docs/modules/ROOT/pages/landing-page/releases.adoc
@@ -28,7 +28,7 @@ If you like to live on the bleeding edge, there are also nightly builds of the f
* link:https://github.com/apache-isis-committers/isis-nightly[CI]
* link:https://repo.incode.cloud/[Maven Repo]
-* link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
+* link:https://apache-isis-committers.github.io/isis-nightly[Website preview]
Although these are maintained and used by the framework's committers, do be aware that *these are _not_ official ASF releases*; they are provided as a convenience only.
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/releases.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/releases.adoc
index 8dfe567..c6fa0e9 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/releases.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/releases.adoc
@@ -11,5 +11,5 @@
*** link:https://github.com/apache-isis-committers/isis-nightly[CI]
*** link:https://repo.incode.cloud/[Maven Repo]
-*** link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
+*** link:https://apache-isis-committers.github.io/isis-nightly[Website preview]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
index c3deaa1..91fffdc 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
@@ -1,3 +1,4 @@
+[#menubars-layout]
= MenuBars Layout
: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 [...]
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService.adoc
index 7dcf5d9..9e22e8a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-
-WARNING: TODO: v2: to document - backing service for ConfigurationMenu;
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ConfigurationViewService` is the backing service for xref:ConfigurationMenu.adoc[`ConfigurationMenu`].
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService.adoc
index 3a8445b..8099079 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ContentMappingService` supports the (default implementation of the) xref:core:runtime-services:ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:vro:ROOT:about.adoc[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService.adoc
index 0469cbb..4b2747e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `DeepLinkService` provides the ability to obtain a `java.net.URI` that links to a representation of any (persisted) domain entity or view model.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService.adoc
index f010688..f0d93d4 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `EmailNotificationService` supports the xref:vw:ROOT:features.adoc#user-registration[user registration] (self sign-up) features of the xref:vw:ROOT:about.adoc[Wicket viewer] whereby a user can sign-up to access an application by providing a valid email address.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService.adoc
index 6769ce3..d6248a2 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `EmailService` provides the ability to send HTML emails, with attachments, to one or more recipients.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService.adoc
index 796eb25..5c079fc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ErrorReportingService` service is an optional SPI that provides the ability to record any errors/exceptions that might occur in the application into an external incident recording system (such as JIRA or Slack).
The service also allows a user-friendly (jargon-free) error message to be returned and rendered to the end-user, along with an optional incident reference (eg a JIRA issue `XXX-1234`).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService.adoc
index 61c714f..e674e6d 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService.adoc
@@ -3,9 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `EventBusService` allows domain objects to emit events to subscribing domain services using an in-memory event bus.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer.adoc
index 294b918..010a963 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - v2 - not yet reviewed/updated.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ExceptionRecognizer` SPI provides the mechanism for both the domain programmer and also for components to be able to recognize and handle certain exceptions that may be thrown by the system.
Rather than display an obscure error to the end-user, the application can instead display a user-friendly message.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc
index 4d880f9..768e9b1 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ExceptionRecognizerService` domain service is used by the framework to iterate over all registered xref:refguide:applib-svc:ExceptionRecognizer.adoc[`ExceptionRecognizer`]s to attempt to recognise an exception.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService.adoc
index 1447995..785765f 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService.adoc
@@ -3,11 +3,10 @@
: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 [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
-The `FactoryService` collects together methods for instantiating domain objects.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+The `FactoryService` collects together methods for instantiating domain objects.
== API
@@ -48,7 +47,7 @@ For example:
[source,java]
----
-Customer cust = factoryService.instantiate(Customer.class);
+Customer cust = factoryService.detachedEntity(Customer.class);
cust.setFirstName("Freddie");
cust.setLastName("Mercury");
repositoryService.persist(cust);
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
index 92aa45a..15bc15a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `GridLoaderService` provides the ability to load the XML layout (grid) for a domain class.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
index 1823541..cd4d133 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `GridService` provides the ability to load the XML layout (grid) for a domain class.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService.adoc
index bd7109b..14968d2 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `GridSystemService` encapsulates a single layout grid system which can be used to customize the layout
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
index 884d2d3..927c887 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `HintStore` service defines an SPI for the xref:vw:ROOT:about.adoc[Wicket viewer] to store UI hints on a per-object basis.
For example, the viewer remembers which tabs are selected, and for collections which view is selected (eg table or hidden), which page of a table to render, or whether "show all" (rows) is toggled.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
index 7ce52a6..b656dd3 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `InteractionContext` is a request-scoped domain service that is used to obtain the current
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
index 117c21b..cb8a05a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The `JaxbService` allows instances of JAXB-annotated classes to be marshalled to XML and unmarshalled from XML back into domain objects.
== API
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
index d27618b..e655f09 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The `LayoutService` domain service provides the ability to obtain the XML layout for a single domain object or for all domain objects.
This functionality is surfaced through the user interface through a related xref:refguide:applib-svc:LayoutService.adoc#related-mixins-and-menus[mixin and menu action].
@@ -70,6 +72,7 @@ The only annotation that can be safely removed from the source code with this st
The framework provides a default implementation, `o.a.i.core.metamodel.services.layout.LayoutServiceDefault`.
+[#related-mixins-and-menus]
== Related Mixins and Menus
The service's functionality is exposed in the UI through a mixin (per object) and a menu action (for all objects):
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc
index c378a6b..74a7fe1 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `LayoutServiceMenu` service simply provides a UI to allow layouts (obtained from xref:LayoutService.adoc[`LayoutService`]) to be downloaded within the UI.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider.adoc
index 0bf203c..4496dfc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider.adoc
@@ -4,6 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `LocaleProvider` service is one of the services that work together to implement Apache Isis' support for i18n, being used by Isis' default implementation of xref:refguide:applib-svc:TranslationService.adoc[`TranslationService`].
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
index 3dce0bc..c64f9b6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
@@ -3,8 +3,9 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-The `MenuBarsLoaderService` is used by the default implementation of xref:refguide:applib-svc:MenuBarsService.adoc[MenuBarsService] to return a a xref:applib-classes:classes/menubars.adoc[`MenuBars`] instance deserialized from the `menubars.layout.xml` file read from the classpath.
+The `MenuBarsLoaderService` is used by the default implementation of xref:refguide:applib-svc:MenuBarsService.adoc[MenuBarsService] to return a a xref:applib-classes:layout.adoc#menubars-layout[`MenuBars`] instance deserialized from the `menubars.layout.xml` file read from the classpath.
== SPI
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
index 3cdd9c8..41f1733 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
@@ -3,10 +3,9 @@
: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 [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-
-The `MenuBarsService` is responsible for returning a xref:applib-classes:classes/menubars.adoc[`MenuBars`] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
+The `MenuBarsService` is responsible for returning a xref:applib-classes:layout.adoc#menubars-layout[`MenuBars`] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
This is used by the Wicket viewer to build up the menu, and is also served as the "menuBars" resource by the xref:vro:ROOT:about.adoc[Restful Objects] viewer.
== SPI
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService.adoc
index a9b47d1..3363222 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService.adoc
@@ -4,6 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `MessageService` allows domain objects to raise information, warning or error messages.
These messages can either be simple strings, or can be translated.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService.adoc
index 3d76a03..269e36a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `MetaModelService` service provides access to a number of aspects of Apache Isis' internal metamodel.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu.adoc
index 480f2c9..2a163a1 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The `MetaModelServiceMenu` service simply provides a UI to allow domain model metadata (obtained from xref:MetaModelService.adoc[`MetaModelService`]) to be downloaded within the UI.
== API
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
index b72fcfb..c477bdc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService.adoc
@@ -4,6 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `MetricsService` is an xref:refguide:applib-ant:IsisSessionScope.adoc[`IsisSessionScope`]d domain service that hooks into the JDO/DataNucleus ObjectStore to provide a number of counters relating to numbers of object loaded, dirtied etc.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
index 0ea139d..1387554 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `PublisherService` API is intended for coarse-grained publish/subscribe for system-to-system interactions, from Apache Isis to some other system.
Events that can be published are action invocations/property edits, and changed objects.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache.adoc
index 9d8a072..883140a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The purpose of the `QueryResultsCache` is to improve response times to the user, by providing a request-scoped cache of the value of some (safe or idempotent) method call.
This will typically be as the result of running a query, but could be any expensive operation.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc
index 620016b..2a45a13 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The `QueryResultsCacheControl` domain service is used to enable or disable caching by xref:refguide:applib-svc:QueryResultsCache.adoc[`QueryResultsCache`].
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService.adoc
index be99b98..5cb4ae6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `RepositoryService` collects together methods for creating, persisting and searching for entities from the underlying persistence store.
It acts as an abstraction over the JDO/DataNucleus objectstore.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService.adoc
index 4fa7a14..8cefad9 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `RoutingService` provides the ability to return (and therefore render) an alternative object from an action invocation.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad.adoc
index 2b00098..a236106 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad.adoc
@@ -3,13 +3,11 @@
: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 [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `Scratchpad` domain service allows objects to exchange information even if they do not directly call each other.
-
== API
The API of `Scratchpad` service is:
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc
index ee22d56..eb77df6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector.adoc
@@ -2,8 +2,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO - v2 - to document.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
== API
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry.adoc
index 00ab898..427283a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry.adoc
@@ -3,9 +3,9 @@
: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 [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-The `ServiceRegistry2` domain service (and its various supertypes)collects together methods for injecting or looking up domain services (either provided by the framework or application-specific) currently known to the runtime.
+The `ServiceRegistry` domain service (and its various supertypes)collects together methods for injecting or looking up domain services (either provided by the framework or application-specific) currently known to the runtime.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService.adoc
index 4abcbec..726c9bc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `SessionLoggingService` defines an SPI to keep track of (typically: to log) the current sessions that are using the application.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService.adoc
index 8d85a60..be3c520 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `SudoService` allows the current user reported by the xref:refguide:applib-svc:UserService.adoc[`UserService`] to be temporarily changed to some other user.
This is useful both for xref:testing:integtestsupport:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService.adoc
index bf0e816..d10dd5e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `SwaggerService` generates link:http://swagger.io/[Swagger] spec files to describe the public and/or private RESTful APIs exposed by the xref:vro:ROOT:about.adoc[RestfulObjects viewer].
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService.adoc
index 9c38b48..89b87aa 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService.adoc
@@ -3,8 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `TableColumnOrderService` provides the ability to reorder (or suppress) columns in both parented- and standalone tables.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService.adoc
index e9efdb5..aa8688a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService.adoc
@@ -3,12 +3,10 @@
: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 [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `TitleService` provides methods to programmatically obtain the title and icon of a domain object.
-
-
== API
The API of `TitleService` is:
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
index 93f8e2b..30aea66 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService.adoc
@@ -4,8 +4,8 @@
:page-partial:
-WARNING: TODO - to review for v2.
-Document `Transaction` and `TransactionId` and `TransactionState`.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+// TODO: Document `Transaction` and `TransactionId` and `TransactionState`.
The `TransactionService` (and its various supertypes) allows domain objects to influence user transactions.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService.adoc
index 4373b9b..b96c8cd 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `TranslationService` is the cornerstone of Apache Isis' i18n support.
Its role is to be able to provide translated versions of the various elements within the Apache Isis metamodel (service and object classes, properties, collections, actions, action parameters) and also to translate business rule (disable/valid) messages, and exceptions.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver.adoc
index 059b92e..e5e96ff 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `TranslationsResolver` domain service locates and return translations.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService.adoc
index 6aa8f85..7621132 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `UrlEncodingService` defines a consistent way to convert strings to/from a form safe for use within a URL.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService.adoc
index 8eaefd1..d79953e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `UserProfileService` provides the ability for the domain application to return supplementary metadata about the current user. This information is used (by the xref:vw:ROOT:about.adoc[Wicket viewer]) to customize the appearance of the tertiary "Me" menu bar (top right). For example, rather than display the username, instead the user's first and last name could be displayed.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService.adoc
index 3cf9543..66bbf9a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `UserRegistrationService` provides the ability for users to sign-up to access an application by providing a valid email address, and also provides the capability for users to reset their password if forgotten.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/UserService.adoc
index e83ea48..c92ba2e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/UserService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/UserService.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - to review for v2.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `UserService` allows the domain object to obtain the identity of the user interacting with said object.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
index 6f22e65..db749d4 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
@@ -3,7 +3,6 @@
: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 [...]
:page-partial:
-WARNING: Document `WrappingObject`, document `AsyncControl`
The `WrapperFactory` provides the ability to enforce business rules for programmatic interactions between domain objects.
@@ -75,6 +74,7 @@ For mixins, the behaviour of the wrapper is similar but simpler.
Mixin wrappers only apply to actions, and so the wrapper will enforce the hidden/disable/validate rules before executing.
In addition, any xref:refguide:applib-methods:prefixes.adoc#default[`default...()`], xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`] or xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] methods can be called.
+[#synccontrol]
==== `SyncControl`
The `SyncControl` class controls the way that a (synchronous) wrapper works.
@@ -127,6 +127,7 @@ Executing in a separate thread means that the target and arguments are used in a
If any of these are entities, they are retrieved from the database afresh; it isn't possible to pass domain entity references from the foreground calling thread to the background threads.
+[#asynccontrol]
==== `AsyncControl`
The `AsyncControl` class controls the way that an asynchronous wrapper -- as obtained by `asyncWrapXxx(...)` -- works.
@@ -221,7 +222,3 @@ public class CustomerAgent {
<1> if any constraints on the `Order`'s `refund()` action would be violated, then ...
<2> ... these will be trapped and raised to the user as a warning.
-
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService.adoc
index e7aa076..1b9ad22 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `XmlSnapshotService` provides the capability to generate XML snapshots (and if required corresponding XSD schemas) based on graphs of domain objects.
diff --git a/core/security/src/main/adoc/modules/core/pages/about.adoc b/core/security/src/main/adoc/modules/core/pages/about.adoc
index 92437c7..9c868a9 100644
--- a/core/security/src/main/adoc/modules/core/pages/about.adoc
+++ b/core/security/src/main/adoc/modules/core/pages/about.adoc
@@ -2,4 +2,4 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
diff --git a/extensions/security/audit-trail/adoc/modules/audit-trail/pages/about.adoc b/extensions/security/audit-trail/adoc/modules/audit-trail/pages/about.adoc
index 540f0b9..05dbfcd 100644
--- a/extensions/security/audit-trail/adoc/modules/audit-trail/pages/about.adoc
+++ b/extensions/security/audit-trail/adoc/modules/audit-trail/pages/about.adoc
@@ -2,7 +2,8 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2 - this code has not yet been brought into the framework.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The xref:security:audit-trail:about.adoc[Auditer] module provides an implementation of the xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`], as well as a number of related domain services,
It creates an audit record for each changed property (ie every time that `AuditerService#audit(...)` is called.
diff --git a/extensions/security/secman/adoc/modules/secman/pages/about.adoc b/extensions/security/secman/adoc/modules/secman/pages/about.adoc
index cf7d66d..b43f248 100644
--- a/extensions/security/secman/adoc/modules/secman/pages/about.adoc
+++ b/extensions/security/secman/adoc/modules/secman/pages/about.adoc
@@ -2,6 +2,8 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
This SecMan module provides a complete security subdomain for users, roles, permissions; all are persisted as domain entities.
What that means, of course, that they can also be administered through your Apache Isis application.
diff --git a/extensions/security/session-log/adoc/modules/session-log/pages/about.adoc b/extensions/security/session-log/adoc/modules/session-log/pages/about.adoc
index 6c5ce39..7845d78 100644
--- a/extensions/security/session-log/adoc/modules/session-log/pages/about.adoc
+++ b/extensions/security/session-log/adoc/modules/session-log/pages/about.adoc
@@ -2,5 +2,5 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2 - will move this into the framework, update these docs
+WARNING: TODO
diff --git a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
index 9676d14..9105a3b 100644
--- a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
+++ b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/pages/about.adoc
@@ -2,15 +2,15 @@
: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 [...]
-TODO
+WARNING: TODO
-see `shiro.ini` (example)
+// see `shiro.ini` (example)
//[source,properties]
//----
//include::security:shiro-realm-ldap:example$shiro.ini[]
//----
-== Setting up Users/Groups in Apache Directory Studio
+// == Setting up Users/Groups in Apache Directory Studio
diff --git a/extensions/vro/cors/adoc/modules/cors/pages/about.adoc b/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
index d639242..0093c80 100644
--- a/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
+++ b/extensions/vro/cors/adoc/modules/cors/pages/about.adoc
@@ -2,6 +2,6 @@
: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 [...]
-TODO: v2: placeholder for documentation about extensions/vro/
+WARNING: TODO
-For more about CORS, see for example link:https://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-definedhttps://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-defined[this blog post at www.moesif.com]
+//For more about CORS, see for example link:https://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-definedhttps://www.moesif.com/blog/technical/cors/Authoritative-Guide-to-CORS-Cross-Origin-Resource-Sharing-for-REST-APIs/#how-is-origin-defined[this blog post at www.moesif.com]
diff --git a/extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc b/extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc
index d978f89..35e610e 100644
--- a/extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc
+++ b/extensions/vro/cors/adoc/modules/cors/partials/module-nav.adoc
@@ -1,5 +1,2 @@
-
-
-
-** xref:vw:vro:about.adoc[CORS]
+** xref:vro:cors:about.adoc[CORS]
diff --git a/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc b/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
index dd12fa9..d890a70 100644
--- a/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
+++ b/extensions/vw/exceldownload/adoc/modules/exceldownload/pages/about.adoc
@@ -3,5 +3,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about excel-download
-
+WARNING: TODO
diff --git a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
index 28ea850..fc28cd4 100644
--- a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
+++ b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about fullcalendar
-
+WARNING: TODO
diff --git a/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc b/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc
index 857d929..5e552b7 100644
--- a/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc
+++ b/extensions/vw/gmap3/adoc/modules/gmap3/pages/about.adoc
@@ -2,6 +2,5 @@
: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 [...]
-
-TODO: v2: placeholder for documentation about gmap3
+WARNING: TODO
diff --git a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
index 158297f..e3a7614 100644
--- a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
+++ b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about pdfjs
-
+WARNING: TODO
diff --git a/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc b/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
index 452438b..427494d 100644
--- a/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
+++ b/incubator/core/model/src/main/adoc/modules/model/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about incubator/model
-
+WARNING: TODO
diff --git a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
index e6d4d15..9bd6407 100644
--- a/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
+++ b/incubator/mappings/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about incubator/model
-
+WARNING: TODO
diff --git a/legacy/adoc/modules/ROOT/nav.adoc b/legacy/adoc/modules/ROOT/nav.adoc
index b978522..6485415 100644
--- a/legacy/adoc/modules/ROOT/nav.adoc
+++ b/legacy/adoc/modules/ROOT/nav.adoc
@@ -1,4 +1,4 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::incubator:ROOT:partial$component-nav.adoc[]
+include::legacy:ROOT:partial$component-nav.adoc[]
diff --git a/legacy/adoc/modules/ROOT/partials/component-nav.adoc b/legacy/adoc/modules/ROOT/partials/component-nav.adoc
index a2ef5bc..1eff803 100644
--- a/legacy/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/legacy/adoc/modules/ROOT/partials/component-nav.adoc
@@ -1,8 +1,6 @@
-include::legacy:ROOT:partial$module-nav.adoc[]
include::legacy:applib:partial$module-nav.adoc[]
include::legacy:commons:partial$module-nav.adoc[]
include::legacy:runtime:partial$module-nav.adoc[]
include::legacy:restclient:partial$module-nav.adoc[]
-
include::legacy:servletapi:partial$module-nav.adoc[]
diff --git a/legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc b/legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc
index 6caec93..7f60221 100644
--- a/legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc
+++ b/legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc
@@ -2,5 +2,5 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2: placeholder for documentation about legacy/applib
+WARNING: TODO
diff --git a/legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc b/legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc
index c615577..99c1753 100644
--- a/legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc
+++ b/legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc
@@ -1,6 +1,3 @@
-
-
-
* xref:legacy:applib:about.adoc[Applib]
diff --git a/legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc b/legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc
index ae7080d..4cc95c2 100644
--- a/legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc
+++ b/legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc
@@ -2,5 +2,4 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2: placeholder for documentation about legacy/commons
-
+WARNING: TODO
diff --git a/legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc b/legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
index 4dbbb8f..2cc4bbe 100644
--- a/legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
+++ b/legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
@@ -1,6 +1,3 @@
-
-
-
* xref:legacy:commons:about.adoc[Commons]
diff --git a/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
index fc06ac9..cd1987a 100644
--- a/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
+++ b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
@@ -2,5 +2,4 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-WARNING: TODO: v2: placeholder for documentation about legacy/runtime
-
+WARNING: TODO
diff --git a/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
index e760323..7b27889 100644
--- a/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
+++ b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
@@ -1,6 +1,3 @@
-
-
-
* xref:legacy:runtime:about.adoc[Runtime]
diff --git a/legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc b/legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
index 586a945..66e103c 100644
--- a/legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
+++ b/legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO: v2: placeholder for documentation about legacy/applib
-
+WARNING: TODO
diff --git a/legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc b/legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
index c441318..3326290 100644
--- a/legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
+++ b/legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
@@ -1,6 +1,3 @@
-
-
-
* xref:legacy:restclient:about.adoc[REST Client]
diff --git a/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc
index 23249d1..8977089 100644
--- a/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc
+++ b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc
@@ -2,5 +2,4 @@
: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 [...]
-TODO
-
+WARNING: TODO
diff --git a/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc
index 1983eee..80256f4 100644
--- a/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc
+++ b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc
@@ -1,6 +1,3 @@
-
-
-
* xref:vw:servletapi:about.adoc[Servlet API (Extension)]
diff --git a/mappings/publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc b/mappings/publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc
index dd9d31d..78f7e37 100644
--- a/mappings/publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc
+++ b/mappings/publisher/adoc/modules/outbox-publisher/partials/module-nav.adoc
@@ -1,6 +1,6 @@
-* xref:outbox-publisher:about.adoc[Publisher]
+* xref:outbox-publisher:about.adoc[Outbox Publisher]
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/about.adoc b/persistence/jdo/adoc/modules/ROOT/pages/about.adoc
index 7d25cab..3aed534 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/about.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/about.adoc
@@ -4,6 +4,9 @@
:page-toc: ~
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
+
The JDO/DataNucleus object store enables domain objects to be persisted to relational as well as NoSQL databases.
The object store is implemented using link:http://datanucleus.org[DataNucleus].
@@ -11,12 +14,4 @@ This user guide discuss end-user features, configuration and customization of th
-[NOTE]
-====
-DataNucleus as a product also supports the JPA API; Apache Isis is likely to also support JPA in the future.
-====
-
-
-
-
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/configuring.adoc b/persistence/jdo/adoc/modules/ROOT/pages/configuring.adoc
index 130acbf..1e067aa 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/configuring.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/configuring.adoc
@@ -3,9 +3,11 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The xref:refguide:config:about.adoc[Configuration Guide] includes a xref:refguide:config:sections/isis.persistence.jdo-datanucleus.adoc[section] for JDO/Persistence object store, and another xref:refguide:config:sections/isis.persistence.jdo-datanucleus.impl.adoc[section] for configuration that is passed through to DataNucleus unchanged.
-WARNING: TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
+//WARNING: TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
//Apache Isis programmatically configures DataNucleus; any Apache Isis properties with the prefix `isis.persistence.jdo-datanucleus.impl` are passed through directly to the JDO/DataNucleus objectstore (with the prefix stripped off, of course).
//
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
index ae74fb1..c049bbd 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -3,6 +3,9 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
In the same way that Java packages act as a namespace for domain objects, it's good practice to map domain entities to their own (database) schemas.
For example:
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc b/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc
index 7990b02..a025034 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -4,9 +4,9 @@
: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 [...]
-This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
-
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc b/persistence/jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc
index 23dcb5f..d64ee7f 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/jdo-mappings.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
include::jdo-mappings/one-to-m-bidirectional-relationships.adoc[leveloffset=+1]
diff --git a/security/adoc/modules/ROOT/pages/about.adoc b/security/adoc/modules/ROOT/pages/about.adoc
index d5058e6..1fcc10e 100644
--- a/security/adoc/modules/ROOT/pages/about.adoc
+++ b/security/adoc/modules/ROOT/pages/about.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
This guide describes the authentication and authorization features available to secure your Apache Isis application.
@@ -12,7 +14,7 @@ This guide describes the authentication and authorization features available to
== Terminology
-WARNING: TODO:v2: these words could perhaps move into the "security API" module, currently empty.
+// TODO:v2: these words could perhaps move into the "security API" module, currently empty.
Apache Isis has built-in support for authentication and authorization:
@@ -25,12 +27,12 @@ Apache Isis has two levels of permissions.
_Read_ permission means that the user can view the object member; it will be rendered in the UI. An action with only read permission will be shown disabled ("greyed out".
_Write_ permission means that the object member can be changed. For actions this means that they can be invoked.
-WARNING: TODO: v2: this is out of date, because there is also a keycloak integration.
+//WARNING: TODO: v2: this is out of date, because there is also a keycloak integration.
The framework provides an API for both authentication and authorization, and provides an implementation that integrates with link:http://shiro.apache.org[Apache Shiro].
Shiro in turn uses the concept of a _realm_ as a source for both authentication and optionally authorization.
-WARNING: TODO: v2: Spring Boot requires that shiro.ini is on classpath, not in WEB-INF.
+//WARNING: TODO: v2: Spring Boot requires that shiro.ini is on classpath, not in WEB-INF.
Shiro ships with a simple text-based realm -- the `IniRealm` -- which reads users (and password), user roles and role permissions from the `WEB-INF/shiro.ini` file.
The xref:docs:starters:helloworld.adoc[HelloWorld] and xref:docs:starters:simpleapp.adoc[SimpleApp] starter apps are both configured to use this realm.
diff --git a/security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc b/security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
index f474735..9a04916 100644
--- a/security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
+++ b/security/adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
@@ -4,6 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
By and large the security mechanisms within Isis are transparent to the rest of the framework.
@@ -12,8 +13,6 @@ The sections below explain how this works.
NOTE: the content below also appears in the respective user guides for the xref:vw:ROOT:about.adoc[Wicket Viewer] and the xref:vro:ROOT:about.adoc[Restful Objects viewer].
-
-
== Wicket Viewer
include::vw:ROOT:partial$security/pages.adoc[]
@@ -23,8 +22,6 @@ include::vw:ROOT:partial$security/pages.adoc[]
include::vw:ROOT:partial$security/user-registration.adoc[]
-
-
== Restful Objects Viewer
include::vro:ROOT:partial$security/web-xml.adoc[]
diff --git a/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc b/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
index 31149e7..ed60416 100644
--- a/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
+++ b/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO - v2 - this material has not been reviewed / is potentially out of date
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The bypass implementation, as its name suggests, allows both authentication and authorization to be bypassed.
diff --git a/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc b/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
index 7fda92c..7622592 100644
--- a/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
+++ b/security/keycloak/src/main/adoc/modules/keycloak/pages/about.adoc
@@ -3,6 +3,8 @@
: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 [...]
:page-partial:
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
This guide describes the configuration of the Keycloak implementation of Apache Isis' `Authenticator and `Authorizor` APIs.
diff --git a/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
index 81f87e7..44312fc 100644
--- a/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
+++ b/security/shiro/src/main/adoc/modules/shiro/pages/about.adoc
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-WARNING: TODO: v2: this needs to be updated for Spring Boot etc.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
This guide describes the configuration of the Shiro implementation of Apache Isis' `Authenticator and `Authorizor` APIs.
diff --git a/security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc b/security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
index 9aec600..0ba4206 100644
--- a/security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
+++ b/security/shiro/src/main/adoc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
@@ -65,7 +65,7 @@ Setting it to `true` may cause a race condition resulting in exceptions being lo
== Bootstrapping Shiro
-TODO: v2: this configuration is no longer required in `web.xml`, instead is configured programmatically by the framework (`WebModule_Shiro`).
+//TODO: v2: this configuration is no longer required in `web.xml`, instead is configured programmatically by the framework (`WebModule_Shiro`).
The Shiro environment (in essence, thread-locals holding the security credentials) needs to be bootstrapped using the following settings in the `WEB-INF/web.xml` file:
diff --git a/valuetypes/adoc/modules/ROOT/pages/about.adoc b/valuetypes/adoc/modules/ROOT/pages/about.adoc
index 762b27c..cd5d313 100644
--- a/valuetypes/adoc/modules/ROOT/pages/about.adoc
+++ b/valuetypes/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Value Type Libraries
+= Value Type Catalog
: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 [...]
diff --git a/valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc b/valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc
index 9a7bf6f..f3417ac 100644
--- a/valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc
+++ b/valuetypes/asciidoc/adoc/modules/asciidoc/partials/module-nav.adoc
@@ -1,5 +1,5 @@
-* xref:vw:asciidoc:about.adoc[Asciidoc]
+* xref:valuetypes:asciidoc:about.adoc[Asciidoc]
diff --git a/valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc b/valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc
index d7c726b..0d2b66c 100644
--- a/valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc
+++ b/valuetypes/markdown/adoc/modules/markdown/partials/module-nav.adoc
@@ -1,5 +1,5 @@
-* xref:vw:markdown:about.adoc[Markdown]
+* xref:valuetypes:markdown:about.adoc[Markdown]
diff --git a/valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc b/valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc
index a8909ca..92cf808 100644
--- a/valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc
+++ b/valuetypes/sse/adoc/modules/sse/partials/module-nav.adoc
@@ -1,5 +1,5 @@
-* xref:vw:sse:about.adoc[SSE]
+* xref:valuetypes:sse:about.adoc[SSE]
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
index 4ea0be5..599e1e8 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/about.adoc
@@ -4,14 +4,13 @@
:page-aliases: guides:ugvro:ugvro.adoc
-Apache Isis' Restful Objects viewer is an implementation of the link:http://restfulobjects.org[Restful Objects spec],
-which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API. Having a REST
-API opens up an Apache Isis domain model to a huge variety of applications, from bespoke single-page apps,
-through integration scenarios, through providing an API for bulk-upload/migration from an existing system.
-
-The Restful Objects viewer also provides a number of extensions specific to Apache Isis. Most significant of these is
-enhanced content negotiation support, making it easier to use the returned representations within bespoke clients using
-standard third-party configurations.
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
+
+Apache Isis' Restful Objects viewer is an implementation of the link:http://restfulobjects.org[Restful Objects spec], which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API. Having a REST API opens up an Apache Isis domain model to a huge variety of applications, from bespoke single-page apps, through integration scenarios, through providing an API for bulk-upload/migration from an existing system.
+
+The Restful Objects viewer also provides a number of extensions specific to Apache Isis.
+Most significant of these is enhanced content negotiation support, making it easier to use the returned representations within bespoke clients using standard third-party configurations.
This user guide discuss features, configuration and also how to extend the Restful Objects viewer.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc
index 97c31fb..721189c 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/architecture.adoc
@@ -2,53 +2,38 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-The xref:vro:ROOT:about.adoc[RestfulObjects viewer] implements the http://restfulobjects.org[Restful Object spec], meaning
-that it defines a well-defined set of endpoint URLs as resources, and generates a well-defined set of (JSON)
-representations when these resources are accessed.
+The xref:vro:ROOT:about.adoc[RestfulObjects viewer] implements the http://restfulobjects.org[Restful Object spec], meaning that it defines a well-defined set of endpoint URLs as resources, and generates a well-defined set of (JSON) representations when these resources are accessed.
-By default, the Restful Objects viewer will automatically handle requests and return representations according to the
-RO spec. However, its internal architecture provides several hooks for content negotiation, thereby allowing the
-generated representation to be influenced using the standard HTTP `Accept` header. In response, the server uses
-the `Content-Type` header which the client can use to know how to process the returned representation.
+By default, the Restful Objects viewer will automatically handle requests and return representations according to the RO spec.
+However, its internal architecture provides several hooks for content negotiation, thereby allowing the generated representation to be influenced using the standard HTTP `Accept` header.
+In response, the server uses the `Content-Type` header which the client can use to know how to process the returned representation.
* `RepresentationService` +
-+
-The xref:core:runtime-services:RepresentationService.adoc[`RepresentationService`] is an SPI domain service (plugin-point)
-that allows an arbitrary representation to be generated for any of the resources defined in the RO spec. +
-+
-Normally this SPI service need not be replaced, because the default implementation
-(`RepresentationServiceContentNegotiator`) simply uses the HTTP `Accept` header and delegates onto another service, the
-(slightly misnamed) `ContentNegotiationService`, to actually generate the representation. There can be multiple
-implementations of the `ContentNegotiationService` and the content negotiator will delegate to each in turn until one
-is able to handle the request (per the chain of responsibliity pattern).
++ The xref:core:runtime-services:RepresentationService.adoc[`RepresentationService`] is an SPI domain service (plugin-point) that allows an arbitrary representation to be generated for any of the resources defined in the RO spec. +
++ Normally this SPI service need not be replaced, because the default implementation (`RepresentationServiceContentNegotiator`) simply uses the HTTP `Accept` header and delegates onto another service, the (slightly misnamed) `ContentNegotiationService`, to actually generate the representation.
+There can be multiple implementations of the `ContentNegotiationService` and the content negotiator will delegate to each in turn until one is able to handle the request (per the chain of responsibliity pattern).
* `ContentNegotiationService` +
-+
-As noted above, there can be multiple implementations of the
-xref:core:runtime-services:ContentNegotiationService.adoc[`ContentNegotiationService`], each one handling a particular
-HTTP `Accept` header. If the implementation does not recognize the value of the header, if can simply return `null`. +
-+
-The framework provides a number of implementations; an implementation that handles the
-xref:vro:ROOT:simplified-representations.adoc[simplified representation] of the Apache Isis profile; an implementation that provides support for the `x-ro-domain-type` parameter, and a
-default/fallback implementation that returns the representations defined by the RO spec.
++ As noted above, there can be multiple implementations of the
+xref:core:runtime-services:ContentNegotiationService.adoc[`ContentNegotiationService`], each one handling a particular HTTP `Accept` header.
+If the implementation does not recognize the value of the header, if can simply return `null`. +
++ The framework provides a number of implementations; an implementation that handles the
+xref:vro:ROOT:simplified-representations.adoc[simplified representation] of the Apache Isis profile; an implementation that provides support for the `x-ro-domain-type` parameter, and a default/fallback implementation that returns the representations defined by the RO spec.
* `ContentMappingService` +
-+
-The xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`] is used by the implementation of
-`ContentNegotationService` that recognizes the `x-ro-domain-type`, its role being to transform a domain object
-(usually an entity) into some other form (usually a DTO), as specified by the `x-ro-domain-type` parameter. There
-can be many such implementations, each handling a different target domain type.
-
++ The xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`] is used by the implementation of
+`ContentNegotationService` that recognizes the `x-ro-domain-type`, its role being to transform a domain object (usually an entity) into some other form (usually a DTO), as specified by the `x-ro-domain-type` parameter.
+There can be many such implementations, each handling a different target domain type.
This diagram shows how these services collaborate:
image::rgfis/service-collaborations.png[width="800px",link="{imagesdir}/rgfis/service-collaborations.png"]
-Taken together these domain services offer a lot of flexibility in terms of the representations that can be generated
-from the RestfulObjects viewer.
+Taken together these domain services offer a lot of flexibility in terms of the representations that can be generated from the RestfulObjects viewer.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc
index 47b18fc..7624592 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -2,10 +2,12 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
The xref:refguide:config:about.adoc[Configuration Guide] includes a xref:refguide:config:sections/isis.viewer.restfulobjects.adoc[section] for the Restful Objects viewer.
-WARNING: TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
+// TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
//The Restful Objects viewer provides a couple of configuration option that extend/simplify/alter the representations generated from the Restful Objects specification.
//
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc
index 2800373..f069976 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/health-check.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The xref:refguide:applib-svc:HealthCheckService.adoc[`HealthCheckService`] SPI allows applications to provide an implementation of that service which can indicate the overall health of the application.
The "health" is defined by the very simple `Health` class, where a non-null message indicates a problem, otherwise everything is ok:
@@ -32,7 +33,6 @@ Either way, the viewer will serialize a `Health` object into JSON, with the mime
Monitoring infrastructure or container orchestrators (such as Docker Swarm and Kubernetes) can then be configured to call this endpoint to check on the health of the application and take remedial action if not.
-
== Session Management
The Restful Objects viewer will execute the `HealthCheckService` using a hard-coded user and role:
@@ -44,7 +44,6 @@ This design means that there is no need to configure monitoring infrastructure w
Moreover (unless the `HealthCheckService` implementation uses the `WrapperFactory` to invoke actions), it shouldn't be needed to set up a security account for this user name.
-
== REST API Mapping
The `/restful/health` path must be specified as a "passThru" in `web.xml` so that no authentication challenge is issued.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc
index e251b5e..8691855 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
index abe1448..c1665cf 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
@@ -2,13 +2,12 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
Apache Isis' Restful Objects viewer provides a number of additional resource endpoints that provide representations of the object layout (as per xref:refguide:applib-svc:GridService.adoc[`GridService`]) and of the menu layout (as per xref:refguide:applib-svc:MenuBarsService.adoc[`MenuBarsService`]).
This chapter provides details of these resources, the link ``Rel``s to access them, and the resultant representations.
-
-
== MenuBars
The xref:refguide:applib-svc:MenuBarsService.adoc[`MenuBarsService`] provides the `menu.layout.xml` XML document which defines how to group the various domain service actions into menubars, menus and menu sections.
@@ -105,8 +104,6 @@ This can also be obtained in JSON format in the usual way (by specifying an HTTP
}
----
-
-
== Domain Object Icon
The representation returned by the domain object resource (section 14.4 of the RO spec v1.0) has been extended to provide a link to the icon image (`.png`) to use:
@@ -129,7 +126,6 @@ The representation returned by the domain object resource (section 14.4 of the R
Note that because of dynamic icons (the xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`] supporting method) the image returned can vary on an instance-by-instance basis.
-
== Domain Object Layout
The xref:refguide:applib-svc:GridService.adoc[`GridService`] provides an XML document which defines the layout of any of domain object.
@@ -216,7 +212,6 @@ This can also be obtained as JSON (using `Accept: application/json` HTTP header)
}
----
-
== Domain Type Layout
The representation of the domain types resource (section 22.2 of RO spec v1.0) has also been extended to return the (type) layout:
@@ -237,11 +232,8 @@ The representation of the domain types resource (section 22.2 of RO spec v1.0) h
}
----
-
The representation returned by this resource is essentially exactly the same as the layout returned by xref:refguide:applib-svc:GridService.adoc[`GridService`] (it is not dynamically extended with links).
-
-
== Static vs Dynamic Resources
The xref:vro:ROOT:layout-resources.adoc#menu-layout[menu layout] representation includes all possible domain services; it does not follow that the current user has access to all of these actions (some may be hidden or disabled).
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
index e3cb95e..9c6f78c 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
@@ -2,69 +2,58 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-The Restful Objects v1.0 specification defines a comprehensive hypermedia API, consisting of HTTP resources and
-corresponding JSON representations, for accessing and manipulating a domain object model.
+The Restful Objects v1.0 specification defines a comprehensive hypermedia API, consisting of HTTP resources and corresponding JSON representations, for accessing and manipulating a domain object model.
The Restful Objects spec can be downloaded from link:http://restfulobjects.org[here] as either a PDF or Word doc.
-
-
== Goals of the Spec
-The goal of Restful Objects is to allow domain models to be accessed through HTTP resources, returning a set of JSON
-representations. These representations can then be consumed by any client (e.g. Javascript, Java, .NET, Ruby, Python).
+The goal of Restful Objects is to allow domain models to be accessed through HTTP resources, returning a set of JSON representations.
+These representations can then be consumed by any client (e.g. Javascript, Java, .NET, Ruby, Python).
-Both the resources and representations are generalized so that they can be applied to any domain model, and by default
-all representations have media types designed to allow a completely generic client to be written, capable of working,
-unmodified, with any domain model that has a Restful Objects interface.
+Both the resources and representations are generalized so that they can be applied to any domain model, and by default all representations have media types designed to allow a completely generic client to be written, capable of working, unmodified, with any domain model that has a Restful Objects interface.
-Alternatively, the developer may write a custom client that has some shared knowledge of the domain being exposed, and
-render the information in a more specific fashion.
+Alternatively, the developer may write a custom client that has some shared knowledge of the domain being exposed, and render the information in a more specific fashion.
-Restful Objects also defines that representations are served up with parameterized media types. This allows clients to
-use content negotiation to ensure that representations do not change in a breaking fashion, enabling server and client
-to evolve independently.
+Restful Objects also defines that representations are served up with parameterized media types.
+This allows clients to use content negotiation to ensure that representations do not change in a breaking fashion, enabling server and client to evolve independently.
-The Restful Objects specification is at a higher-level of abstraction than, say, the JAX-RS specifications for Java
-platform, or the WCF specifications on .NET. Specifically, the domain classes that it exposes are represented in a very
-general form. They consist of:
+The Restful Objects specification is at a higher-level of abstraction than, say, the JAX-RS specifications for Java platform, or the WCF specifications on .NET. Specifically, the domain classes that it exposes are represented in a very general form.
+They consist of:
* properties (fields), each holding either a scalar value or reference to another object;
* collections, each holding a vector reference to other entities;
* actions (operations/methods), whereby the object can execute business logic.
-Beyond this, though, Restful Objects makes very few assumptions. In particular, Restful Objects does not prescribe the
-nature of the domain model.
+Beyond this, though, Restful Objects makes very few assumptions.
+In particular, Restful Objects does not prescribe the nature of the domain model.
The Restful Objects spec may be downloaded directly from github as either a PDF or as a Word doc.
-
== Resources and Representations
-The diagram below - taken from the Restful Objects spec - shows the various resources (URLs) and representations (JSON)
-that are defined:
+The diagram below - taken from the Restful Objects spec - shows the various resources (URLs) and representations (JSON) that are defined:
image::restfulobjects/ro-spec-resources-and-representations.png[width="800px",link="{imagesdir}/restfulobjects/ro-spec-resources-and-representations.png"]
-The resource URLs are always well-defined, but Apache Isis' implementation allows for different representations to
-be returned, using content negotiation. This is discussed further below.
+The resource URLs are always well-defined, but Apache Isis' implementation allows for different representations to be returned, using content negotiation.
+This is discussed further below.
[NOTE]
====
-In fact, there's nothing in Apache Isis to prevent you from defining your own REST controllers to provide custom
-resource URLs. One use case might be to support user registration/authentication, a topic out-of-scope of the RO spec
-itself.
+In fact, there's nothing in Apache Isis to prevent you from defining your own REST controllers to provide custom resource URLs.
+One use case might be to support user registration/authentication, a topic out-of-scope of the RO spec itself.
====
-
== Apache Isis' implementation
-The Restful Objects viewer is Apache Isis' implementation of the Restful Objects spec. It implements all the mandatory
-features of the specification. It also implements some of the optional capabilities (as defined in section 3 of the
-RO spec, and as represented in the version resource, section 8.1):
+The Restful Objects viewer is Apache Isis' implementation of the Restful Objects spec.
+It implements all the mandatory features of the specification.
+It also implements some of the optional capabilities (as defined in section 3 of the RO spec, and as represented in the version resource, section 8.1):
-[cols="1a,1a,1a", options="header"]
+[cols="1a,1a,1a",options="header"]
|===
| Capability
@@ -95,15 +84,9 @@ RO spec, and as represented in the version resource, section 8.1):
|===
-
-
-
== Extensions
-The Restful Objects viewer also implements some of the "future ideas" that are out of scope for the RO spec v1.0, but
-described in section 34, "ideas for future extensions".
-
-
+The Restful Objects viewer also implements some of the "future ideas" that are out of scope for the RO spec v1.0, but described in section 34, "ideas for future extensions".
=== Content Negotiation (34.1)
@@ -111,9 +94,9 @@ Apache Isis provides two levels of support for content negotiation.
==== `x-ro-domain-type`
-The first level is very similar to the "Domain Model Agnostic" approach sketched out in the RO spec. The client
-can send an `x-ro-domain-type` parameter for either domain object representations (section 14 of the spec) or
-action invocation results (section 19 of the spec). This can be combined with either `application/json` or
+The first level is very similar to the "Domain Model Agnostic" approach sketched out in the RO spec.
+The client can send an `x-ro-domain-type` parameter for either domain object representations (section 14 of the spec) or action invocation results (section 19 of the spec).
+This can be combined with either `application/json` or
`application/xml`.
For example, the client could use an `Accept` header such as:
@@ -123,16 +106,14 @@ For example, the client could use an `Accept` header such as:
Accept: application/xml;x-ro-domain-type="com.mycompany.viewmodels.v2.CustomerViewModel"
----
-The server will use the xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`] to attempt to
-transform the domain object into the requested `x-ro-domain-type`. The whole process is discussed in more detail in
-the xref:vro:ROOT:architecture.adoc[architecture] chapter.
-
+The server will use the xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`] to attempt to transform the domain object into the requested `x-ro-domain-type`.
+The whole process is discussed in more detail in the xref:vro:ROOT:architecture.adoc[architecture] chapter.
==== Apache Isis profile
The representations defined by the RO spec are very rich and enable complex client-side applications to be built.
-However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party
-components that expect to consume much simpler representations. Examples of such tools are
+However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party components that expect to consume much simpler representations.
+Examples of such tools are
link:http://angular-ui.github.io/bootstrap/[Angular Bootstrap],
link:http://vitalets.github.io/angular-xeditable/[Angular XEditable],
link:https://github.com/mgcrea/angular-strap[Angular Strap].
@@ -140,17 +121,14 @@ link:https://github.com/mgcrea/angular-strap[Angular Strap].
This support is discussed further in the xref:vro:ROOT:simplified-representations.adoc[simplified representations]
chapter.
-
=== Minimizing Round-trips (34.4)
-The Restful Objects viewer supports the `x-ro-follow-links` query parameter in a way very similar to that suggested
-in the RO spec, the main point being to avoid the "N+1" problem of too many (slow) network calls. For example, using
-this feature one can load a grid of data in a single call. (That said, the xref:vro:ROOT:simplified-representations.adoc[simplified representations]
+The Restful Objects viewer supports the `x-ro-follow-links` query parameter in a way very similar to that suggested in the RO spec, the main point being to avoid the "N+1" problem of too many (slow) network calls.
+For example, using this feature one can load a grid of data in a single call.
+(That said, the xref:vro:ROOT:simplified-representations.adoc[simplified representations]
supported by Restful Objects viewer also support this use case, albeit in way that deviates from the RO spec).
-This link:https://www.youtube.com/watch?v=hSKnqqBQ7Zo[screencast] demonstrates the Restful Object viewer's support for `x-ro-follow-links` parameter, using the link:http://github.com/apache/isis-app-kitchensink[Isis addons' kitchensink] app as the example,
-This app contains three entities, `Grandparent`, `Parent` and `Child` that define a hierarchy of 1:m relationships.
-
+This link:https://www.youtube.com/watch?v=hSKnqqBQ7Zo[screencast] demonstrates the Restful Object viewer's support for `x-ro-follow-links` parameter, using the link:http://github.com/apache/isis-app-kitchensink[Isis addons' kitchensink] app as the example, This app contains three entities, `Grandparent`, `Parent` and `Child` that define a hierarchy of 1:m relationships.
The queries that are shown in the screencast include:
@@ -170,13 +148,10 @@ pass:[<pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=membe
+
pass:[<pre>http://localhost:8080/restful/objects/CHILD/0?x-ro-follow-links=members[parent\].value.members[children\].value]
-
-
==== Honor UI hints
By default the representations generated by Restful Objects ignore any Apache Isis metamodel hints referring to the UI.
-In particular, if a collection is annotated then `Render(EAGERLY)` then the contents of the collection are _not_
-eagerly embedded in the object representation.
+In particular, if a collection is annotated then `Render(EAGERLY)` then the contents of the collection are _not_ eagerly embedded in the object representation.
However, this behaviour can be overridden globally using the
xref:refguide:config:sections/isis.viewer.restfulobjects.adoc#isis.viewer.restfulobjects.honor-ui-hints[`isis.viewer.restfulobjects.adoc#isis.viewer.restfulobjects.honor-ui-hints`] configuration property:
@@ -186,5 +161,4 @@ xref:refguide:config:sections/isis.viewer.restfulobjects.adoc#isis.viewer.restfu
isis.viewer.restfulobjects.adoc#isis.viewer.restfulobjects.honor-ui-hints=true
----
-This means that standard Apache Isis annotations can be used as a simple way to obtain follow-links (driven from the
-server model, though, rather than the requesting client).
+This means that standard Apache Isis annotations can be used as a simple way to obtain follow-links (driven from the server model, though, rather than the requesting client).
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc
index dde8e15..3d6c2b6 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/security.adoc
@@ -2,6 +2,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
include::vro:ROOT:partial$security/web-xml.adoc[]
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc
index 8e1dc90..e2956c5 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The representations defined by the RO spec are very rich and enable complex client-side applications to be built.
However, their sophistication can be an impediment to their use if one wishes to write a simple app using third-party components that expect to consume much simpler representations.
@@ -11,7 +12,6 @@ link:http://angular-ui.github.io/bootstrap/[Angular Bootstrap],
link:http://vitalets.github.io/angular-xeditable/[Angular XEditable],
link:https://github.com/mgcrea/angular-strap[Angular Strap].
-
Apache Isis also provides support for its own simplified representation for the most commonly-used representations.
This is implemented using the `ContentNegotiationService` described in the
xref:vro:ROOT:architecture.adoc[architecture] chapter.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
index 1498abc..8d05228 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
@@ -3,9 +3,10 @@
: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 [...]
:page-aliases: guides:ugvw:ugvw.adoc
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
-The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users. The viewer is
-implemented using link:http://wicket.apache.org[Apache Wicket].
+The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users.
+The viewer is implemented using link:http://wicket.apache.org[Apache Wicket].
This user guide discuss end-user features, configuration and customization of the Wicket viewer.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
index 80276e0..593ce0e 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -2,10 +2,11 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The xref:refguide:config:about.adoc[Configuration Guide] includes a xref:refguide:config:sections/isis.viewer.wicket.adoc[section] for the Wicket viewer.
-WARNING: TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
+// TODO - v2 - detail on original config properties (not yet reviewed) currently commented out.
//Wicket configuration properties alter the way in which Apache Isis' Wicket viewer renders domain objects.
//
@@ -15,7 +16,7 @@ WARNING: TODO - v2 - detail on original config properties (not yet reviewed) cur
//
//To tell Apache Isis that the Wicket viewer is in use (and should therefore search for the `viewer_wicket.properties` file), add the following to `WEB-INF/web.xml`:
//
-//// TODO: v2: is this still supported? I doubt it.
+// TODO: v2: is this still supported? I doubt it.
//
//[source, xml]
//----
@@ -27,7 +28,7 @@ WARNING: TODO - v2 - detail on original config properties (not yet reviewed) cur
//
//Alternatively, because most of these configuration properties tend not to change between environment (development and production), another practice is to load them programmatically from the `AppManifest`:
//
-//// TODO: v2: any reference to AppManifestAbstract will need updating.
+// TODO: v2: any reference to AppManifestAbstract will need updating.
//
//[source,java]
//----
@@ -279,7 +280,7 @@ WARNING: TODO - v2 - detail on original config properties (not yet reviewed) cur
//
//=== Remember Me
//
-//// TODO: v2: these screenshots could be updated, perhaps now with secman we could use examples from helloworld?
+// TODO: v2: these screenshots could be updated, perhaps now with secman we could use examples from helloworld?
//
//The 'remember me' checkbox on the login page can be suppressed, if required, by setting a configuration flag:
//
@@ -449,7 +450,7 @@ WARNING: TODO - v2 - detail on original config properties (not yet reviewed) cur
//
//These configuration properties that effect the overall presentation and appearance of the viewer.
//
-//// TODO: v2: we should rename these
+// TODO: v2: we should rename these
//
//[NOTE]
//====
@@ -818,7 +819,7 @@ WARNING: TODO - v2 - detail on original config properties (not yet reviewed) cur
//| URL
//|Specifies the URL if live reload is set up, eg: +
//`http://localhost:35729/livereload.js?snipver=1`
-//// xref:setupguide:intellij:hints-and-tips.adoc#using-gradle-for-livereload[live reload] is set up, eg: +
+// xref:setupguide:intellij:hints-and-tips.adoc#using-gradle-for-livereload[live reload] is set up, eg: +
//
//|`isis.viewer.wicket.` +
//`stripWicketTags`
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc
index 4613ef8..caccf07 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/customisation.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
This chapter describes a number of mechanisms by which the UI provided by the Wicket viewer can be customised.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
index 645d78b..238c30b 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
@@ -2,6 +2,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The Wicket viewer allows you to customize the GUI in several (progressively more sophisticated) ways:
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/features.adoc b/viewers/wicket/adoc/modules/ROOT/pages/features.adoc
index 07b3607..19c0948 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/features.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/features.adoc
@@ -2,6 +2,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
This chapter highlights a number of features of the wicket viewer from the perspective of an end-user actually using your Apache Isis application.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc
index 54343ff..0e53b37 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -3,6 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc b/viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc
deleted file mode 100644
index 4688f2e..0000000
--- a/viewers/wicket/adoc/modules/ROOT/pages/incode-platform.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= Appendix: Incode Platform (not ASF)
-
-: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 [...]
-
-// TODO: remove
-
-The (non-ASF) link:https://platform.incode.org[Incode Platform^] provides a number of extensions to the Wicket viewer (leveraging the APIs described in xref:vw:ROOT:extending.adoc[Extending the Wicket viewer] section, later.
-While you are free to fork and adapt any of them to your needs, they are also intended for use "out-of-the-box".
-
-At the time of writing the addons available are:
-
-* Excel Wicket component - to export a collection of domain objects as an Excel spreadsheet
-
-** see also the related Excel library module which can be used to read/import a spreadsheet as an collection of view models or entities
-
-* fullcalendar2 Wicket component - to view a collection of domain objects (with a date) on a full-page calendar
-
-* Gmap3 Wicket component - to view a collection of domain objects with a location on a google map
-
-* pdf.js Wicket component - to view a `Blob` containing a PDF as an image
-
-* Summernote Wicket component - to edit a string property using an RTF editor
-
-** (not yet compatible with `1.15.0`)
-
-* Wickedcharts Wicket component - low-level integration with Highcharts charting library
-
-
-Check the link:https://platform.incode.org[website^] for the most up-to-date list.
-
-
-NOTE: The Incode Platform, although maintained by Apache Isis committers, is not part of the ASF.
-
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/security.adoc b/viewers/wicket/adoc/modules/ROOT/pages/security.adoc
index d8ca252..aa5ed6c 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/security.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/security.adoc
@@ -2,6 +2,8 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WARNING: TODO: this content has not yet been reviewed/updated for v2.0
+
//
// These pages are include:d in both this viewer and in the security guide
[isis] 01/03: ISIS-2062: refguide, methods
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 63fc66569d9d5a073c4875d6c3f2fc9a3de9786b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 27 15:22:15 2020 +0000
ISIS-2062: refguide, methods
---
.../resources/attachments/IsisCheatSheet.docx | Bin 23869 -> 24336 bytes
.../resources/attachments/IsisCheatSheet.pdf | Bin 179877 -> 195020 bytes
api/adoc/refguide/modules/ROOT/pages/about.adoc | 3 +-
.../modules/ROOT/partials/component-nav.adoc | 3 +-
.../btb/pages/hints-and-tips/custom-css.adoc | 2 +-
.../hints-and-tips/view-model-instantiation.adoc | 2 +-
.../applib-ant/pages/ActionLayout/redirect.adoc | 2 +-
.../applib-ant/pages/Collection/editing.adoc | 2 +-
.../main/adoc/modules/applib-ant/pages/Column.adoc | 2 +-
.../pages/DomainObject/autoCompleteRepository.adoc | 2 +-
.../applib-ant/pages/DomainObject/bounding.adoc | 2 +-
.../DomainObject/persistingLifecycleEvent.adoc | 2 +-
.../pages/DomainObject/removingLifecycleEvent.adoc | 2 +-
.../pages/DomainObject/updatingLifecycleEvent.adoc | 2 +-
.../pages/DomainObjectLayout/cssClassFa.adoc | 2 +-
.../pages/DomainObjectLayout/cssClassUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/iconUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/layoutUiEvent.adoc | 2 +-
.../pages/DomainObjectLayout/titleUiEvent.adoc | 2 +-
.../applib-ant/pages/DomainService/objectType.adoc | 2 +-
.../adoc/modules/applib-ant/pages/MinLength.adoc | 2 +-
.../adoc/modules/applib-ant/pages/Parameter.adoc | 4 +-
.../applib-ant/pages/Parameter/fileAccept.adoc | 4 +-
.../adoc/modules/applib-ant/pages/PrimaryKey.adoc | 2 +-
.../adoc/modules/applib-ant/pages/Property.adoc | 4 +-
.../modules/applib-ant/pages/Property/editing.adoc | 2 +-
.../applib-ant/pages/Property/fileAccept.adoc | 2 +-
.../modules/applib-ant/pages/XmlRootElement.adoc | 4 +-
.../{applib-cm => applib-classes}/examples.sh | 0
.../examples/clock/Clock.java | 0
.../examples/clock/package-info.java | 0
.../examples/domain/DomainObjectList.java | 0
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../examples/events/EventObjectBase.java | 0
.../events/domain/AbstractDomainEvent.java | 0
.../examples/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../examples/events/ui/AbstractUiEvent.java | 0
.../examples/events/ui/CssClassUiEvent.java | 0
.../examples/events/ui/IconUiEvent.java | 0
.../examples/events/ui/LayoutUiEvent.java | 0
.../examples/events/ui/TitleUiEvent.java | 0
.../examples/graph/Edge.java | 0
.../examples/graph/SimpleEdge.java | 0
.../examples/graph/Vertex.java | 0
.../examples/graph/tree/LazyTreeNode.java | 0
.../examples/graph/tree/TreeAdapter.java | 0
.../examples/graph/tree/TreeNode.java | 0
.../graph/tree/TreeNode_iteratorBreadthFirst.java | 0
.../graph/tree/TreeNode_iteratorDepthFirst.java | 0
.../graph/tree/TreeNode_iteratorHierarchyUp.java | 0
.../examples/graph/tree/TreePath.java | 0
.../examples/graph/tree/TreePath_Default.java | 0
.../examples/graph/tree/TreeState.java | 0
.../examples/graph/tree/TreeState_Default.java | 0
.../layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 0
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/CssClassFaPosition.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../examples/layout/component/FieldSet.java | 0
.../examples/layout/component/FieldSetOwner.java | 0
.../examples/layout/component/HasBookmarking.java | 0
.../examples/layout/component/HasCssClass.java | 0
.../examples/layout/component/HasCssClassFa.java | 0
.../examples/layout/component/HasDescribedAs.java | 0
.../examples/layout/component/HasHidden.java | 0
.../examples/layout/component/HasNamed.java | 0
.../examples/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../examples/layout/component/Owned.java | 0
.../examples/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 0
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../examples/layout/component/package-info.java | 0
.../examples/layout/grid/Grid.java | 0
.../examples/layout/grid/GridAbstract.java | 0
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../examples/layout/grid/bootstrap3/BS3Col.java | 0
.../layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../examples/layout/grid/bootstrap3/BS3Grid.java | 0
.../examples/layout/grid/bootstrap3/BS3Row.java | 0
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../examples/layout/grid/bootstrap3/BS3Tab.java | 0
.../layout/grid/bootstrap3/BS3TabGroup.java | 0
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../examples/layout/grid/bootstrap3/HasCssId.java | 0
.../examples/layout/grid/bootstrap3/Size.java | 0
.../examples/layout/grid/bootstrap3/SizeSpan.java | 0
.../layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../examples/layout/links/Link.java | 0
.../examples/layout/links/package-info.java | 0
.../examples/layout/menubars/Menu.java | 0
.../examples/layout/menubars/MenuBar.java | 0
.../examples/layout/menubars/MenuBars.java | 0
.../examples/layout/menubars/MenuBarsAbstract.java | 0
.../examples/layout/menubars/MenuSection.java | 0
.../layout/menubars/bootstrap3/BS3Menu.java | 0
.../layout/menubars/bootstrap3/BS3MenuBar.java | 0
.../layout/menubars/bootstrap3/BS3MenuBars.java | 0
.../layout/menubars/bootstrap3/BS3MenuSection.java | 0
.../layout/menubars/bootstrap3/package-info.java | 0
.../examples/layout/package-info.java | 0
.../examples/mixins/MixinConstants.java | 0
.../examples/mixins/dto/Dto.java | 0
.../examples/mixins/dto/Dto_downloadXml.java | 0
.../examples/mixins/dto/Dto_downloadXsd.java | 0
.../examples/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../examples/mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../examples/mixins/timestamp/HoldsUpdatedAt.java | 0
.../examples/mixins/timestamp/HoldsUpdatedBy.java | 0
.../examples/mixins/timestamp/Timestampable.java | 0
.../examples/mixins/timestamp/package-info.java | 0
.../examples/spec/AbstractSpecification.java | 0
.../examples/spec/AbstractSpecification2.java | 0
.../examples/spec/Specification.java | 0
.../examples/spec/Specification2.java | 0
.../examples/spec/SpecificationAnd.java | 0
.../examples/spec/SpecificationNot.java | 0
.../examples/spec/SpecificationOr.java | 0
.../examples/spec/package-info.java | 0
.../examples/util/Enums.java | 0
.../examples/util/Equality.java | 0
.../examples/util/Hashing.java | 0
.../examples/util/JaxbAdapters.java | 0
.../examples/util/JaxbUtil.java | 0
.../examples/util/ObjectContract_Empty.java | 0
.../examples/util/ObjectContract_Impl.java | 0
.../examples/util/ObjectContract_Parser.java | 0
.../examples/util/ObjectContracts.java | 0
.../examples/util/ReasonBuffer.java | 0
.../examples/util/ReasonBuffer2.java | 0
.../examples/util/Reasons.java | 0
.../examples/util/TitleBuffer.java | 0
.../examples/util/TitleBufferException.java | 0
.../examples/util/ToString.java | 0
.../examples/util/ZipWriter.java | 0
.../examples/util/package-info.java | 0
.../examples/util/schema/ChangesDtoUtils.java | 0
.../examples/util/schema/CommandDtoUtils.java | 0
.../examples/util/schema/CommonDtoUtils.java | 0
.../examples/util/schema/InteractionDtoUtils.java | 0
.../util/schema/MemberExecutionDtoUtils.java | 0
.../examples/value/Blob.java | 0
.../examples/value/Clob.java | 0
.../examples/value/Image.java | 0
.../examples/value/LocalResourcePath.java | 0
.../examples/value/Markup.java | 0
.../examples/value/NamedWithMimeType.java | 0
.../examples/value/Password.java | 0
.../examples/value/package-info.java | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../images/value-types/markup.png | Bin
.../modules/{applib-cm => applib-classes}/nav.adoc | 0
.../pages}/ViewModel.adoc | 0
.../pages/about.adoc} | 26 +--
.../pages}/contributee.adoc | 0
.../pages}/domainevent.adoc | 8 +-
.../pages}/domainevent/AbstractDomainEvent.adoc | 6 +-
.../pages}/domainevent/ActionDomainEvent.adoc | 2 +-
.../pages}/domainevent/CollectionDomainEvent.adoc | 2 +-
.../pages}/domainevent/PropertyDomainEvent.adoc | 2 +-
.../classes => applib-classes/pages}/i18n.adoc | 0
.../pages}/i18n/TranslatableString.adoc | 0
.../classes => applib-classes/pages}/layout.adoc | 0
.../pages}/lifecycleevent.adoc | 17 +-
.../lifecycleevent/AbstractLifecycleEvent.adoc | 14 +-
.../pages}/lifecycleevent/ObjectCreatedEvent.adoc | 2 +-
.../pages}/lifecycleevent/ObjectLoadedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistingEvent.adoc | 2 +-
.../pages}/lifecycleevent/ObjectRemovingEvent.adoc | 2 +-
.../pages}/lifecycleevent/ObjectUpdatedEvent.adoc | 2 +-
.../pages}/lifecycleevent/ObjectUpdatingEvent.adoc | 2 +-
.../classes => applib-classes/pages}/menubars.adoc | 4 +-
.../classes => applib-classes/pages}/mixins.adoc | 0
.../pages}/mixins/Dto.adoc | 6 +-
.../pages}/mixins/Object.adoc | 2 +-
.../pages}/mixins/Persistable.adoc | 4 +-
.../classes => applib-classes/pages}/roles.adoc | 0
.../pages}/roles/HoldsUpdatedAt.adoc | 2 +-
.../pages}/roles/HoldsUpdatedBy.adoc | 2 +-
.../pages}/roles/Timestampable.adoc | 4 +-
.../classes => applib-classes/pages}/spec.adoc | 2 +-
.../classes => applib-classes/pages}/uievent.adoc | 12 +-
.../pages}/uievent/CssClassUiEvent.adoc | 2 +-
.../pages}/uievent/IconUiEvent.adoc | 2 +-
.../pages}/uievent/TitleUiEvent.adoc | 2 +-
.../classes => applib-classes/pages}/utility.adoc | 0
.../pages}/utility/Enums.adoc | 0
.../pages}/utility/ObjectContracts.adoc | 0
.../pages}/utility/Reasons.adoc | 0
.../pages}/utility/TitleBuffer.adoc | 2 +-
.../pages}/value-types.adoc | 0
.../pages}/value-types/Blob.adoc | 0
.../pages}/value-types/Clob.adoc | 0
.../pages}/value-types/Markup.adoc | 0
.../applib-classes/partials/module-nav.adoc | 6 +
.../main/adoc/modules/applib-cm/pages/about.adoc | 12 --
.../applib-cm/pages/methods/lifecycle/created.adoc | 16 --
.../applib-cm/pages/methods/lifecycle/jdo-api.adoc | 50 -----
.../applib-cm/pages/methods/lifecycle/removed.adoc | 15 --
.../modules/applib-cm/pages/methods/prefixes.adoc | 217 ---------------------
.../main/adoc/modules/applib-cm/pages/rgcms.adoc | 7 -
.../modules/applib-cm/partials/module-nav.adoc | 9 -
.../{applib-cm => applib-methods}/examples.sh | 0
.../examples/clock/Clock.java | 0
.../examples/clock/package-info.java | 0
.../examples/domain/DomainObjectList.java | 0
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../examples/events/EventObjectBase.java | 0
.../events/domain/AbstractDomainEvent.java | 0
.../examples/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../examples/events/ui/AbstractUiEvent.java | 0
.../examples/events/ui/CssClassUiEvent.java | 0
.../examples/events/ui/IconUiEvent.java | 0
.../examples/events/ui/LayoutUiEvent.java | 0
.../examples/events/ui/TitleUiEvent.java | 0
.../examples/graph/Edge.java | 0
.../examples/graph/SimpleEdge.java | 0
.../examples/graph/Vertex.java | 0
.../examples/graph/tree/LazyTreeNode.java | 0
.../examples/graph/tree/TreeAdapter.java | 0
.../examples/graph/tree/TreeNode.java | 0
.../graph/tree/TreeNode_iteratorBreadthFirst.java | 0
.../graph/tree/TreeNode_iteratorDepthFirst.java | 0
.../graph/tree/TreeNode_iteratorHierarchyUp.java | 0
.../examples/graph/tree/TreePath.java | 0
.../examples/graph/tree/TreePath_Default.java | 0
.../examples/graph/tree/TreeState.java | 0
.../examples/graph/tree/TreeState_Default.java | 0
.../layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 0
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/CssClassFaPosition.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../examples/layout/component/FieldSet.java | 0
.../examples/layout/component/FieldSetOwner.java | 0
.../examples/layout/component/HasBookmarking.java | 0
.../examples/layout/component/HasCssClass.java | 0
.../examples/layout/component/HasCssClassFa.java | 0
.../examples/layout/component/HasDescribedAs.java | 0
.../examples/layout/component/HasHidden.java | 0
.../examples/layout/component/HasNamed.java | 0
.../examples/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../examples/layout/component/Owned.java | 0
.../examples/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 0
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../examples/layout/component/package-info.java | 0
.../examples/layout/grid/Grid.java | 0
.../examples/layout/grid/GridAbstract.java | 0
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../examples/layout/grid/bootstrap3/BS3Col.java | 0
.../layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../examples/layout/grid/bootstrap3/BS3Grid.java | 0
.../examples/layout/grid/bootstrap3/BS3Row.java | 0
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../examples/layout/grid/bootstrap3/BS3Tab.java | 0
.../layout/grid/bootstrap3/BS3TabGroup.java | 0
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../examples/layout/grid/bootstrap3/HasCssId.java | 0
.../examples/layout/grid/bootstrap3/Size.java | 0
.../examples/layout/grid/bootstrap3/SizeSpan.java | 0
.../layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../examples/layout/links/Link.java | 0
.../examples/layout/links/package-info.java | 0
.../examples/layout/menubars/Menu.java | 0
.../examples/layout/menubars/MenuBar.java | 0
.../examples/layout/menubars/MenuBars.java | 0
.../examples/layout/menubars/MenuBarsAbstract.java | 0
.../examples/layout/menubars/MenuSection.java | 0
.../layout/menubars/bootstrap3/BS3Menu.java | 0
.../layout/menubars/bootstrap3/BS3MenuBar.java | 0
.../layout/menubars/bootstrap3/BS3MenuBars.java | 0
.../layout/menubars/bootstrap3/BS3MenuSection.java | 0
.../layout/menubars/bootstrap3/package-info.java | 0
.../examples/layout/package-info.java | 0
.../examples/mixins/MixinConstants.java | 0
.../examples/mixins/dto/Dto.java | 0
.../examples/mixins/dto/Dto_downloadXml.java | 0
.../examples/mixins/dto/Dto_downloadXsd.java | 0
.../examples/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../examples/mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../examples/mixins/timestamp/HoldsUpdatedAt.java | 0
.../examples/mixins/timestamp/HoldsUpdatedBy.java | 0
.../examples/mixins/timestamp/Timestampable.java | 0
.../examples/mixins/timestamp/package-info.java | 0
.../examples/spec/AbstractSpecification.java | 0
.../examples/spec/AbstractSpecification2.java | 0
.../examples/spec/Specification.java | 0
.../examples/spec/Specification2.java | 0
.../examples/spec/SpecificationAnd.java | 0
.../examples/spec/SpecificationNot.java | 0
.../examples/spec/SpecificationOr.java | 0
.../examples/spec/package-info.java | 0
.../examples/util/Enums.java | 0
.../examples/util/Equality.java | 0
.../examples/util/Hashing.java | 0
.../examples/util/JaxbAdapters.java | 0
.../examples/util/JaxbUtil.java | 0
.../examples/util/ObjectContract_Empty.java | 0
.../examples/util/ObjectContract_Impl.java | 0
.../examples/util/ObjectContract_Parser.java | 0
.../examples/util/ObjectContracts.java | 0
.../examples/util/ReasonBuffer.java | 0
.../examples/util/ReasonBuffer2.java | 0
.../examples/util/Reasons.java | 0
.../examples/util/TitleBuffer.java | 0
.../examples/util/TitleBufferException.java | 0
.../examples/util/ToString.java | 0
.../examples/util/ZipWriter.java | 0
.../examples/util/package-info.java | 0
.../examples/util/schema/ChangesDtoUtils.java | 0
.../examples/util/schema/CommandDtoUtils.java | 0
.../examples/util/schema/CommonDtoUtils.java | 0
.../examples/util/schema/InteractionDtoUtils.java | 0
.../util/schema/MemberExecutionDtoUtils.java | 0
.../examples/value/Blob.java | 0
.../examples/value/Clob.java | 0
.../examples/value/Image.java | 0
.../examples/value/LocalResourcePath.java | 0
.../examples/value/Markup.java | 0
.../examples/value/NamedWithMimeType.java | 0
.../examples/value/Password.java | 0
.../examples/value/package-info.java | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../images/value-types/markup.png | Bin
.../modules/{applib-cm => applib-methods}/nav.adoc | 0
.../pages/about.adoc} | 7 +-
.../pages}/lifecycle.adoc | 49 ++---
.../applib-methods/pages/lifecycle/created.adoc | 0
.../pages}/lifecycle/loaded.adoc | 2 +-
.../pages}/lifecycle/persisted.adoc | 4 +-
.../pages}/lifecycle/persisting.adoc | 4 +-
.../pages}/lifecycle/removing.adoc | 4 +-
.../pages}/lifecycle/updated.adoc | 4 +-
.../pages}/lifecycle/updating.adoc | 4 +-
.../modules/applib-methods/pages/prefixes.adoc | 212 ++++++++++++++++++++
.../pages}/prefixes/autoComplete.adoc | 49 ++---
.../pages}/prefixes/choices.adoc | 45 +++--
.../pages}/prefixes/default.adoc | 102 ++++------
.../pages/prefixes/deprecated}/addTo.adoc | 2 +-
.../pages/prefixes/deprecated}/clear.adoc | 2 +-
.../pages/prefixes/deprecated}/modify.adoc | 2 +-
.../pages/prefixes/deprecated}/removeFrom.adoc | 2 +-
.../pages/prefixes/deprecated}/validate.adoc | 0
.../pages/prefixes/deprecated}/validateAddTo.adoc | 2 +-
.../prefixes/deprecated}/validateRemoveFrom.adoc | 2 +-
.../pages}/prefixes/disable.adoc | 81 +++++---
.../pages}/prefixes/get.adoc | 2 +-
.../pages}/prefixes/hide.adoc | 69 ++++---
.../pages}/prefixes/set.adoc | 4 +-
.../methods => applib-methods/pages}/reserved.adoc | 36 ++--
.../pages}/reserved/cssClass.adoc | 13 +-
.../pages/reserved/deprecated}/disable.adoc | 6 +-
.../pages/reserved/deprecated}/getId.adoc | 2 +-
.../pages/reserved/deprecated}/hide.adoc | 8 +-
.../pages/reserved/deprecated}/validate.adoc | 2 +-
.../pages}/reserved/iconName.adoc | 10 +-
.../pages}/reserved/layout.adoc | 14 +-
.../pages}/reserved/title.adoc | 39 ++--
.../applib-methods/partials/module-nav.adoc | 8 +
.../modules/applib-svc/pages/AuditerService.adoc | 2 +-
.../modules/applib-svc/pages/CommandService.adoc | 2 +-
.../applib-svc/pages/GridLoaderService.adoc | 4 +-
.../adoc/modules/applib-svc/pages/GridService.adoc | 6 +-
.../adoc/modules/applib-svc/pages/HintStore.adoc | 2 +-
.../applib-svc/pages/InteractionContext.adoc | 2 +-
.../adoc/modules/applib-svc/pages/JaxbService.adoc | 2 +-
.../modules/applib-svc/pages/LayoutService.adoc | 2 +-
.../applib-svc/pages/MenuBarsLoaderService.adoc | 2 +-
.../modules/applib-svc/pages/MenuBarsService.adoc | 2 +-
.../modules/applib-svc/pages/PublisherService.adoc | 2 +-
.../modules/applib-svc/pages/WrapperFactory.adoc | 8 +-
.../main/adoc/modules/applib-svc/pages/about.adoc | 4 +-
.../pages/fixture-scripts/api-and-usage.adoc | 2 +-
439 files changed, 631 insertions(+), 734 deletions(-)
diff --git a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.docx b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.docx
index 619acfa..6b13cb5 100644
Binary files a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.docx and b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.docx differ
diff --git a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf
index 0760116..baa6247 100644
Binary files a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf and b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf differ
diff --git a/api/adoc/refguide/modules/ROOT/pages/about.adoc b/api/adoc/refguide/modules/ROOT/pages/about.adoc
index 96c7448..9028728 100644
--- a/api/adoc/refguide/modules/ROOT/pages/about.adoc
+++ b/api/adoc/refguide/modules/ROOT/pages/about.adoc
@@ -7,8 +7,9 @@
The reference guides cover:
* xref:refguide:applib-ant:about.adoc[Annotations]
+* xref:refguide:applib-methods:about.adoc[Methods]
+* xref:refguide:applib-classes:about.adoc[Classes]
* xref:refguide:applib-svc:about.adoc[Domain Services]
-* xref:refguide:applib-cm:about.adoc[Classes & Methods]
* xref:refguide:config:about.adoc[Configuration]
* xref:refguide:schema:about.adoc[Schemas]
diff --git a/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc b/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
index 07389e3..0285b49 100644
--- a/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
+++ b/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
@@ -1,6 +1,7 @@
include::refguide:ROOT:partial$module-nav.adoc[]
include::refguide:applib-ant:partial$module-nav.adoc[]
+include::refguide:applib-methods:partial$module-nav.adoc[]
+include::refguide:applib-classes:partial$module-nav.adoc[]
include::refguide:applib-svc:partial$module-nav.adoc[]
-include::refguide:applib-cm:partial$module-nav.adoc[]
include::refguide:config:partial$module-nav.adoc[]
include::refguide:schema:partial$module-nav.adoc[]
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
index 3980cc1..03c14b2 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
@@ -36,7 +36,7 @@ Custom CSS styles can be associated with specific regions of the layout:
<3> Ditto
For example the `custom-width-100` style is used to "stretch" the button for the `exportToWordDoc` action in the left-most column.
-This is accomplished with the following CSS in `static/css/application.css`:
+For the xref:vw:ROOT:about.adoc[Wicket Viewer] this is accomplished with xref:refguide:config:application-specific/application-css.adoc[custom CSS], usually CSS in the `static/css/application.css` file:
[source,css]
----
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
index 5a7ac89..6df8b33 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
@@ -158,5 +158,5 @@ public class YearSummary {
----
<1> "amountsPerOffice" is part of the state of the parent view model
-In this case the `amountsPerOffice` collection is part of the state of the parent view model and so in this particular case everything works with either `FactoryService#instantiate` or using `ServiceRegistry`.
+In this case the `amountsPerOffice` collection is part of the state of the parent view model and so in this particular case everything works with either `FactoryService#create(...)` or using `ServiceRegistry`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc
index 889e167..b90d2d4 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc
@@ -23,7 +23,7 @@ Any properties with xref:refguide:applib-ant:PropertyLayout.adoc#repainting[`@Pr
* if set to `AS_CONFIGURED`, then the default behaviour is as specified by the `isis.viewer.wicket.redirectEvenIfSameObject` xref:vw:ROOT:configuration-properties.adoc[configuration property]).
-One use case for choosing `EVEN_IF_SAME` is if the action "returning this" is intended in some way to require that the object use a different layout, as per multiple layout support, as specified using the xref:refguide:applib-cm:methods.adoc#layout[`layout()`] method.
+One use case for choosing `EVEN_IF_SAME` is if the action "returning this" is intended in some way to require that the object use a different layout, as per multiple layout support, as specified using the xref:refguide:applib-methods:reserved.adoc#layout[`layout()`] method.
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc
index ba783e3..4b30d3e 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc
@@ -27,7 +27,7 @@ If set to `false`, then the object's collections (and properties) are *not* edit
* else, then the value of the `@Collection(editing=...)` attribute itself.
-* else, the result of invoking any supporting xref:refguide:applib-cm:methods/prefixes.adoc#disable[`disable...()`] supporting methods
+* else, the result of invoking any supporting xref:refguide:applib-methods:prefixes.adoc#disable[`disable...()`] supporting methods
Thus, to make a collection read-only even if the object would otherwise be editable, use:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
index 043a96c..ffc09e6 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
@@ -117,7 +117,7 @@ public class PartyRelationship {
=== Mapping ``Blob``s and ``Clob``s
-Isis provides custom value types for xref:refguide:applib-cm:classes/value-types.adoc#Blob[`Blob`]s and xref:refguide:applib-cm:classes/value-types.adoc#Clob[`Clob`]s.
+Isis provides custom value types for xref:applib-classes:classes/value-types.adoc#Blob[`Blob`]s and xref:applib-classes:classes/value-types.adoc#Clob[`Clob`]s.
These value types have multiple internal fields, meaning that they corresponding to multiple columns in the database.
Mapping this correctly requires using `@Column` within JDO's `@Persistent` annotation.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
index d17fcc1..8656c7d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
@@ -13,7 +13,7 @@ Or it could search for a country based on its ISO-3 code or user-friendly name.
[TIP]
====
-If you require additional control - for example restricting the returned results based on the object being interacted with - then use the xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`] supporting method instead.
+If you require additional control - for example restricting the returned results based on the object being interacted with - then use the xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] supporting method instead.
====
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc
index f2522c3..5251437 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc
@@ -30,7 +30,7 @@ public class Currency {
[TIP]
====
There is nothing to prevent you from using this attribute for regular mutable entities, and indeed this is sometimes worth doing during early prototyping.
-However, if there is no realistic upper bound to the number of instances of an entity that might be created, generally you should use xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`] supporting method or the xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`] attribute instead.
+However, if there is no realistic upper bound to the number of instances of an entity that might be created, generally you should use xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] supporting method or the xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`] attribute instead.
====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
index 68ab73a..74cc41b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
@@ -14,7 +14,7 @@ One possible application is to maintain a full-text search database using link:h
[NOTE]
====
Another use case is to maintain "last updated by"/"last updated at" properties.
-While you can roll your own, note that the framework provides built-in support for this use case through the xref:refguide:applib-cm:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
+While you can roll your own, note that the framework provides built-in support for this use case through the xref:applib-classes:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
====
By default the event raised is `ObjectPersistingEvent.Default`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
index 5d6daaa..c47298c 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
@@ -14,7 +14,7 @@ One possible application is to maintain a full-text search database using link:h
[NOTE]
====
Another use case is to maintain "last updated by"/"last updated at" properties.
-While you can roll your own, note that the framework provides built-in support for this use case through the xref:refguide:applib-cm:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
+While you can roll your own, note that the framework provides built-in support for this use case through the xref:applib-classes:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
====
By default the event raised is `ObjectRemovingEvent.Default`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
index a5a4d85..6525726 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
@@ -15,7 +15,7 @@ One possible application is to maintain a full-text search database using link:h
====
Another use case is to maintain "last updated by"/"last updated at" properties.
While you can roll your own, note that the framework provides built-in support for this use case through the
-xref:refguide:applib-cm:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
+xref:applib-classes:classes/roles.adoc#Timestampable[`Timestampable`] role interface.
====
By default the event raised is `ObjectUpdatingEvent.Default`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
index 1b78534..4bf8e6b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
@@ -8,7 +8,7 @@ r
The `cssClassFa` attribute is used to specify the name of a link:http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icon] name, to be rendered as the domain object's icon.
-If necessary the icon specified can be overridden by a particular object instance using the xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`] method.
+If necessary the icon specified can be overridden by a particular object instance using the xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] method.
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
index 92afcc9..608225f 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
@@ -6,7 +6,7 @@
Whenever a domain object is to be rendered, the framework fires off an CSS class UI event to obtain a CSS class to use in any wrapping ``<div>``s and ``<span>``s that render the domain object.
-This is as an alternative to implementing xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`] reserved method.
+This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`] reserved method.
(If `cssClass()` is present, then it will take precedence).
Subscribers subscribe through the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] and can use obtain a reference to the domain object from the event.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
index a73e9ab..0f28727 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
@@ -6,7 +6,7 @@
Whenever a domain object is to be rendered, the framework fires off an icon UI event to obtain an icon (name) for the object (if possible).
-This is as an alternative to implementing xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`] reserved method.
+This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] reserved method.
(If `iconName()` is present, then it will take precedence).
Subscribers subscribe through the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] and can use obtain a reference to the domain object from the event.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
index 05856da..3a95fc3 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
@@ -6,7 +6,7 @@
Whenever a domain object is to be rendered, the framework fires off an layout UI event to obtain an alternative layout name with which to render the domain object.
-This is as an alternative to implementing xref:refguide:applib-cm:methods.adoc#layout[`layout()`] reserved method.
+This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#layout[`layout()`] reserved method.
(If `layout()` is present, then it will take precedence).
Subscribers subscribe through the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] and can use obtain a reference to the domain object from the event.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
index c4dde7c..d936457 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
@@ -6,7 +6,7 @@
Whenever a domain object is to be rendered, the framework fires off a title UI event to obtain a title for the object.
-This is as an alternative to implementing xref:refguide:applib-cm:methods.adoc#title[`title()`] reserved method, or using the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation, within the class itself.
+This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#title[`title()`] reserved method, or using the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation, within the class itself.
(If either `title()` or `@Title` are present, then they will take precedence).
Subscribers subscribe through the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] and can use obtain a reference to the domain object from the event.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc
index 9107075..e567e94 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc
@@ -35,7 +35,7 @@ public class OrderMenu {
The rules of precedence are:
1. `@DomainService#objectType`
-2. xref:refguide:applib-cm:methods.adoc#getId[`getId()`]
+2. xref:refguide:applib-methods:reserved.adoc#getId[`getId()`]
3. The fully qualified class name.
[TIP]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
index d349441..4d2f5a7 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
@@ -4,7 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-The `@MinLength` annotation is used to specify the minimum number of characters in a search of an xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`] supporting method.
+The `@MinLength` annotation is used to specify the minimum number of characters in a search of an xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] supporting method.
[source,java]
----
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
index d9d7392..afa8dda 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
@@ -12,8 +12,8 @@ include::refguide:applib-ant:example$annotation/Parameter.java[tags="refguide"]
----
<.> xref:refguide:applib-ant:Parameter.adoc#fileAccept[`fileAccept()`]
+
-Hints the file type (media type or file extension) to be uploaded for xref:refguide:applib-cm:classes/value-types.adoc#Blob[`Blob`]
-or xref:refguide:applib-cm:classes/value-types.adoc#Clob[`Clob`]. +
+Hints the file type (media type or file extension) to be uploaded for xref:applib-classes:classes/value-types.adoc#Blob[`Blob`]
+or xref:applib-classes:classes/value-types.adoc#Clob[`Clob`]. +
+
Note that this does not prevent the user from uploading some other file type; rather it merely defaults the file type in the file open dialog.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc
index 1f445b8..ebb5f7f 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc
@@ -6,8 +6,8 @@
-The `fileAccept` attribute applies only to xref:refguide:applib-cm:classes/value-types.adoc#Blob[`Blob`]
-or xref:refguide:applib-cm:classes/value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
+The `fileAccept` attribute applies only to xref:applib-classes:classes/value-types.adoc#Blob[`Blob`]
+or xref:applib-classes:classes/value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
The attribute is also supported on xref:refguide:applib-ant:Property.adoc#fileAccept[properties].
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
index 2164f5b..a2fa789 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
@@ -7,7 +7,7 @@
The `@javax.jdo.annotation.PrimaryKey` annotation is used by JDO/DataNucleus to indicate that a property is used as the primary key for an entity with application-managed identity.
-Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#instantiate(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
+Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
[NOTE]
====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
index fa28768..2e34087 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
@@ -43,8 +43,8 @@ The reason that this property cannot be modified.
<.> xref:refguide:applib-ant:Property.adoc#fileAccept[`fileAccept()`]
+
-Hints the file type (media type or file extension) to be uploaded to a xref:refguide:applib-cm:classes/value-types.adoc#Blob[`Blob`]
- or xref:refguide:applib-cm:classes/value-types.adoc#Clob[`Clob`]. +
+Hints the file type (media type or file extension) to be uploaded to a xref:applib-classes:classes/value-types.adoc#Blob[`Blob`]
+ or xref:applib-classes:classes/value-types.adoc#Clob[`Clob`]. +
+
Note that this does not prevent the user from uploading some other file type; rather it merely defaults the file type in the file open dialog.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc
index 1a1c4f2..97a865b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc
@@ -18,7 +18,7 @@ If set to `false`, then the object's properties (and collections) are __not__ ed
* else, then the value of the `@Property(editing=...)` attribute itself
-* else, the result of invoking any supporting xref:refguide:applib-cm:methods/prefixes.adoc#disable[`disable...()`] supporting methods
+* else, the result of invoking any supporting xref:refguide:applib-methods:prefixes.adoc#disable[`disable...()`] supporting methods
Thus, to make a property read-only even if the object would otherwise be editable, use:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc
index 6263025..32384da 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc
@@ -5,7 +5,7 @@
:page-partial:
-The `fileAccept` attribute applies only to xref:refguide:applib-cm:classes/value-types.adoc#Blob[`Blob`] or xref:refguide:applib-cm:classes/value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
+The `fileAccept` attribute applies only to xref:applib-classes:classes/value-types.adoc#Blob[`Blob`] or xref:applib-classes:classes/value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
The attribute is also supported on xref:refguide:applib-ant:Parameter.adoc#fileAccept[parameters].
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
index b73fa83..c531a73 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
@@ -11,7 +11,7 @@ In the case of a JAXB-annotated object this memento is its XML representation.
JAXB generally requires that the root element of the XML representation is annotated with `@XmlRootElement`.
Apache Isis makes this a mandatory requirement.
-In comparison to using either the xref:refguide:applib-cm:classes.adoc#ViewModel[`ViewModel`] interface or the xref:refguide:applib-ant:ViewModel.adoc[`@ViewModel`] annotation, using `@XmlRootElement` has a couple of significant advantages:
+In comparison to using either the xref:applib-classes:about.adoc#ViewModel[`ViewModel`] interface or the xref:refguide:applib-ant:ViewModel.adoc[`@ViewModel`] annotation, using `@XmlRootElement` has a couple of significant advantages:
* the view model can be used as a "canonical" DTO, for example when accessing data using the xref:vro:ROOT:about.adoc[RestfulObjects viewer] in combination with the
xref:refguide:applib-svc:ContentMappingService.adoc[`ContentMappingService`].
@@ -57,7 +57,7 @@ public class ToDoItemDto implements Dto {
Although (like any other viewmodel) a JAXB-annotated can have behaviour (actions) and UI hints, you may wish to keep the DTO "clean", just focused on specifying the data contract.
-Behaviour can therefore be provided using xref:userguide:fun:overview.adoc#mixins[mixins] (annotated with xref:refguide:applib-ant:Mixin.adoc[`@Mixin`]), while xref:refguide:applib-cm:classes/uievent.adoc[UI events] can be used to obtain title, icons and so on.
+Behaviour can therefore be provided using xref:userguide:fun:overview.adoc#mixins[mixins] (annotated with xref:refguide:applib-ant:Mixin.adoc[`@Mixin`]), while xref:applib-classes:classes/uievent.adoc[UI events] can be used to obtain title, icons and so on.
For a more complete discussion of writing JAXB view models/DTOs, see xref:userguide:fun:overview.adoc#view-models[this topic] in the user guide.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples.sh b/api/applib/src/main/adoc/modules/applib-classes/examples.sh
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples.sh
copy to api/applib/src/main/adoc/modules/applib-classes/examples.sh
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java b/api/applib/src/main/adoc/modules/applib-classes/examples/clock/Clock.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/clock/Clock.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/clock/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/clock/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/adoc/modules/applib-classes/examples/domain/DomainObjectList.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/domain/DomainObjectList.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ActionArgumentUsabilityEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ActionArgumentUsabilityEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ActionArgumentVisibilityEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ActionArgumentVisibilityEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/EventObjectBase.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/EventObjectBase.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/EventObjectBase.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/EventObjectBase.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/AbstractDomainEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/AbstractDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/ActionDomainEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/ActionDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/CollectionDomainEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/CollectionDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/PropertyDomainEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/domain/PropertyDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/AbstractLifecycleEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/AbstractLifecycleEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectCreatedEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectCreatedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectLoadedEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectLoadedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectPersistedEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectPersistedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectPersistingEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectPersistingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectRemovingEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectRemovingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectUpdatedEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectUpdatedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectUpdatingEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/lifecycle/ObjectUpdatingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/AbstractUiEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/AbstractUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/CssClassUiEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/CssClassUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/IconUiEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/IconUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/LayoutUiEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/LayoutUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/TitleUiEvent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/events/ui/TitleUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/Edge.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/Edge.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/Edge.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/Edge.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/SimpleEdge.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/SimpleEdge.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/SimpleEdge.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/SimpleEdge.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/Vertex.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/Vertex.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/Vertex.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/Vertex.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/LazyTreeNode.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/LazyTreeNode.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/LazyTreeNode.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/LazyTreeNode.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeAdapter.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeAdapter.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeAdapter.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeAdapter.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorBreadthFirst.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorDepthFirst.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorDepthFirst.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorDepthFirst.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorDepthFirst.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorHierarchyUp.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreePath.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreePath.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath_Default.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreePath_Default.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath_Default.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreePath_Default.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeState.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeState.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState_Default.java b/api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeState_Default.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState_Default.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/graph/tree/TreeState_Default.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ActionLayoutData.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ActionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ActionLayoutDataOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ActionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CollectionLayoutData.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CollectionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CollectionLayoutDataOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CollectionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CssClassFaPosition.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CssClassFaPosition.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CssClassFaPosition.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/CssClassFaPosition.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/DomainObjectLayoutData.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/DomainObjectLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/DomainObjectLayoutDataOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/DomainObjectLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/FieldSet.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/FieldSet.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/FieldSetOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/FieldSetOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasBookmarking.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasBookmarking.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasCssClass.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasCssClass.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasCssClassFa.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasCssClassFa.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasDescribedAs.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasDescribedAs.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasHidden.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasHidden.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasNamed.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/HasNamed.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/MemberRegion.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/MemberRegion.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/MemberRegionOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/MemberRegionOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/Owned.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/Owned.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/Owner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/Owner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/PropertyLayoutData.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/PropertyLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ServiceActionLayoutData.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ServiceActionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ServiceActionLayoutDataOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/ServiceActionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/component/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/Grid.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/Grid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/GridAbstract.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/GridAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFix.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFix.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Col.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Col.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Element.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Element.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Grid.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Grid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Row.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Row.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowContent.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowContent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3RowOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Tab.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3Tab.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabGroup.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabGroup.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabOwner.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/BS3TabOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/HasCssId.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/HasCssId.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/Size.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/Size.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/SizeSpan.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/SizeSpan.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/WithinGrid.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/WithinGrid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/grid/bootstrap3/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/links/Link.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/links/Link.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/links/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/links/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/Menu.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/Menu.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBar.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBar.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBars.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBars.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBarsAbstract.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuBarsAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuSection.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/MenuSection.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3Menu.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3Menu.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuBar.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuBar.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuBars.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuBars.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuSection.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/BS3MenuSection.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/menubars/bootstrap3/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/layout/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/layout/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/MixinConstants.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/MixinConstants.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto_downloadXml.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto_downloadXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto_downloadXsd.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/Dto_downloadXsd.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/dto/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_downloadLayoutXml.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_downloadLayoutXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_openRestApi.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_openRestApi.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_rebuildMetamodel.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/layout/Object_rebuildMetamodel.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_downloadMetaModelXml.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_downloadMetaModelXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_objectIdentifier.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_objectIdentifier.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_objectType.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/metamodel/Object_objectType.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/HoldsUpdatedAt.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/HoldsUpdatedAt.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/HoldsUpdatedBy.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/HoldsUpdatedBy.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/Timestampable.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/Timestampable.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/mixins/timestamp/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/AbstractSpecification.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/AbstractSpecification.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/AbstractSpecification2.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/AbstractSpecification2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/Specification.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/Specification.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/Specification2.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/Specification2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationAnd.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationAnd.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationNot.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationNot.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationOr.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/SpecificationOr.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/spec/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/spec/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/Enums.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/Enums.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/Equality.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/Equality.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/Hashing.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/Hashing.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbAdapters.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbAdapters.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbUtil.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/JaxbUtil.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Empty.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Empty.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Impl.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Impl.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Parser.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContract_Parser.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContracts.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ObjectContracts.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ReasonBuffer.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ReasonBuffer.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ReasonBuffer2.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ReasonBuffer2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/Reasons.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/Reasons.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/TitleBuffer.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/TitleBuffer.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/TitleBufferException.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/TitleBufferException.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ToString.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ToString.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/ZipWriter.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/ZipWriter.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/ChangesDtoUtils.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/ChangesDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommandDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommonDtoUtils.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/CommonDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/InteractionDtoUtils.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/InteractionDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/MemberExecutionDtoUtils.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/util/schema/MemberExecutionDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/Blob.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/Blob.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/Clob.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/Clob.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/Image.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/Image.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/LocalResourcePath.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/LocalResourcePath.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/Markup.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/Markup.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/NamedWithMimeType.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/NamedWithMimeType.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/Password.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/Password.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java b/api/applib/src/main/adoc/modules/applib-classes/examples/value/package-info.java
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java
copy to api/applib/src/main/adoc/modules/applib-classes/examples/value/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png b/api/applib/src/main/adoc/modules/applib-classes/images/reference-classes/issue-in-more-detail.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-classes/issue-in-more-detail.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png b/api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/prefixes/choices/dependent.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png b/api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn b/api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png b/api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/differing.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png b/api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/reference-methods/reserved/iconName/png-files.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png b/api/applib/src/main/adoc/modules/applib-classes/images/value-types/markup.png
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png
copy to api/applib/src/main/adoc/modules/applib-classes/images/value-types/markup.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/nav.adoc b/api/applib/src/main/adoc/modules/applib-classes/nav.adoc
similarity index 100%
copy from api/applib/src/main/adoc/modules/applib-cm/nav.adoc
copy to api/applib/src/main/adoc/modules/applib-classes/nav.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/ViewModel.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/ViewModel.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/ViewModel.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/ViewModel.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
similarity index 63%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
index 956a9d9..df7cb3e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/about.adoc
@@ -8,16 +8,16 @@ This chapter describes the usage of various classes and interfaces that are not
-include::classes/ViewModel.adoc[leveloffset=+1]
-include::classes/domainevent.adoc[leveloffset=+1]
-include::classes/uievent.adoc[leveloffset=+1]
-include::classes/lifecycleevent.adoc[leveloffset=+1]
-include::classes/value-types.adoc[leveloffset=+1]
-include::classes/utility.adoc[leveloffset=+1]
-include::classes/spec.adoc[leveloffset=+1]
-include::classes/i18n.adoc[leveloffset=+1]
-include::classes/contributee.adoc[leveloffset=+1]
-include::classes/roles.adoc[leveloffset=+1]
-include::classes/mixins.adoc[leveloffset=+1]
-include::classes/layout.adoc[leveloffset=+1]
-include::classes/menubars.adoc[leveloffset=+1]
+include::ViewModel.adoc[leveloffset=+1]
+include::domainevent.adoc[leveloffset=+1]
+include::uievent.adoc[leveloffset=+1]
+include::lifecycleevent.adoc[leveloffset=+1]
+include::value-types.adoc[leveloffset=+1]
+include::utility.adoc[leveloffset=+1]
+include::spec.adoc[leveloffset=+1]
+include::i18n.adoc[leveloffset=+1]
+include::contributee.adoc[leveloffset=+1]
+include::roles.adoc[leveloffset=+1]
+include::mixins.adoc[leveloffset=+1]
+include::layout.adoc[leveloffset=+1]
+include::menubars.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/contributee.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/contributee.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc
index 85dfb60..4dbe954 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent.adoc
@@ -20,20 +20,20 @@ They are listed in the table below.
|Notes
-|xref:refguide:applib-cm:classes.adoc#AbstractDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#AbstractDomainEvent[`o.a.i.applib.` +
`AbstractDomainEvent`]
|(abstract class)
|Superclass of the other domain events, listed below in this table.
-|xref:refguide:applib-cm:classes.adoc#ActionDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ActionDomainEvent[`o.a.i.applib.` +
`ActionDomainEvent`]
|(abstract class). +
`ActionDomainEvent.Default` is the concrete implementation used if no `@Action#domainEvent` attribute is specified
|Broadcast whenever there is an interaction (hide/disable/validate/pre-execute/post-execute) with an object's action.
-|xref:refguide:applib-cm:classes.adoc#CollectionDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#CollectionDomainEvent[`o.a.i.applib.` +
`CollectionDomainEvent`]
|(abstract class). +
`CollectionDomainEvent.Default` is the concrete implementation used if no `@Collection#domainEvent` attribute
@@ -41,7 +41,7 @@ is specified.
|Broadcast whenever there is an interaction (hide/disable/validate/access) with an object's collection.
-|xref:refguide:applib-cm:classes.adoc#PropertyDomainEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#PropertyDomainEvent[`o.a.i.applib.` +
`PropertyDomainEvent`]
|(abstract class). +
`PropertyDomainEvent.Default` is the concrete implementation used if no `@Propert#domainEvent` attribute is specified
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc
index adc5137..b3524e5 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/AbstractDomainEvent.adoc
@@ -9,9 +9,9 @@ This class is the superclass for all domain events that are raised by the framew
Its immediate subclasses are:
-* xref:refguide:applib-cm:classes.adoc#ActionDomainEvent[`ActionDomainEvent`]
-* xref:refguide:applib-cm:classes.adoc#PropertyDomainEvent[`PropertyDomainEvent`]
-* xref:refguide:applib-cm:classes.adoc#CollectionDomainEvent[`CollectionDomainEvent`]
+* xref:applib-classes:about.adoc#ActionDomainEvent[`ActionDomainEvent`]
+* xref:applib-classes:about.adoc#PropertyDomainEvent[`PropertyDomainEvent`]
+* xref:applib-classes:about.adoc#CollectionDomainEvent[`CollectionDomainEvent`]
The main purpose of the class is to define the protocol by which subscribers can influence an interaction (eg hide a collection, disable a property, validate action arguments).
It class also provides a simple mechanism to allow adhoc sharing of user data between different phases.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc
index 053579b..18edd1c 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/ActionDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for actions.
+Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for actions.
The class has a number of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc
index ea96b7c..f35e55b 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/CollectionDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for collections.
+Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for collections.
The class has a couple of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc
index 8da26dd..ab19ca4 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/domainevent/PropertyDomainEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for properties.
+Subclass of xref:applib-classes:about.adoc#AbstractDomainEvent[`AbstractDomainEvent`] for properties.
The class has a couple of responsibilities (in addition to those it inherits):
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/i18n.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/i18n/TranslatableString.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/i18n/TranslatableString.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/layout.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/layout.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/layout.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc
similarity index 86%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc
index be64231..4af197f 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent.adoc
@@ -1,3 +1,4 @@
+[#lifecycle-events]
= Lifecycle Events
: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 [...]
@@ -19,13 +20,13 @@ The lifecycle event classes are listed in the table below:
|Notes
-|xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#AbstractLifecycleEvent[`o.a.i.applib.` +
`AbstractLifecycleEvent`]
|(abstract class)
|Superclass of the other lifecycle events, listed below in this table.
-|xref:refguide:applib-cm:classes.adoc#ObjectCreatedEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectCreatedEvent[`o.a.i.applib.` +
`ObjectCreatedEvent`]
|(abstract class). +
`ObjectCreatedEvent.Default` is the concrete implementation that is used.
@@ -33,14 +34,14 @@ The lifecycle event classes are listed in the table below:
`#instantiate(...)` method.
-|xref:refguide:applib-cm:classes.adoc#ObjectLoadedEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectLoadedEvent[`o.a.i.applib.` +
`ObjectLoadedEvent`]
|(abstract class). +
`ObjectLoadedEvent.Default` is the concrete implementation that is used.
|Broadcast when an object is retrieved from the database.
-|xref:refguide:applib-cm:classes.adoc#ObjectPersistedEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectPersistedEvent[`o.a.i.applib.` +
`ObjectPersistedEvent`]
|(abstract class). +
`ObjectPersistedEvent.Default` is the concrete implementation that is used.
@@ -48,7 +49,7 @@ The lifecycle event classes are listed in the table below:
`#persist(...)` method.
-|xref:refguide:applib-cm:classes.adoc#ObjectPersistingEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectPersistingEvent[`o.a.i.applib.` +
`ObjectPersistingEvent`]
|(abstract class). +
`ObjectPersistingEvent.Default` is the concrete implementation that is used.
@@ -56,7 +57,7 @@ The lifecycle event classes are listed in the table below:
`#persist(...)` method.
-|xref:refguide:applib-cm:classes.adoc#ObjectRemovingEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectRemovingEvent[`o.a.i.applib.` +
`ObjectRemovingEvent`]
|(abstract class). +
`ObjectRemovingEvent.Default` is the concrete implementation that is used.
@@ -64,7 +65,7 @@ The lifecycle event classes are listed in the table below:
`#remove(...)` method.
-|xref:refguide:applib-cm:classes.adoc#ObjectUpdatedEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectUpdatedEvent[`o.a.i.applib.` +
`ObjectUpdatedEvent`]
|(abstract class). +
`ObjectUpdatedEvent.Default` is the concrete implementation that is used.
@@ -72,7 +73,7 @@ The lifecycle event classes are listed in the table below:
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
-|xref:refguide:applib-cm:classes.adoc#ObjectUpdatingEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#ObjectUpdatingEvent[`o.a.i.applib.` +
`ObjectUpdatingEvent`]
|``o.a.i.core`` +
``events.lifecycle`` +
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 64%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc
index b336f5f..916a36d 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/AbstractLifecycleEvent.adoc
@@ -9,12 +9,12 @@ This class is the superclass for all lifecycle events that are raised by the fra
Its immediate subclasses are:
-* xref:refguide:applib-cm:classes.adoc#ObjectCreatedEvent[`ObjectCreatedEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectLoadedEvent[`ObjectLoadedEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectPersistedEvent[`ObjectPersistedEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectPersistingEvent[`ObjectPersistingEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectRemovingEvent[`ObjectRemovingEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectUpdatedEvent[`ObjectUpdatedEvent`]
-* xref:refguide:applib-cm:classes.adoc#ObjectUpdatingEvent[`ObjectUpdatingEvent`]
+* xref:applib-classes:about.adoc#ObjectCreatedEvent[`ObjectCreatedEvent`]
+* xref:applib-classes:about.adoc#ObjectLoadedEvent[`ObjectLoadedEvent`]
+* xref:applib-classes:about.adoc#ObjectPersistedEvent[`ObjectPersistedEvent`]
+* xref:applib-classes:about.adoc#ObjectPersistingEvent[`ObjectPersistingEvent`]
+* xref:applib-classes:about.adoc#ObjectRemovingEvent[`ObjectRemovingEvent`]
+* xref:applib-classes:about.adoc#ObjectUpdatedEvent[`ObjectUpdatedEvent`]
+* xref:applib-classes:about.adoc#ObjectUpdatingEvent[`ObjectUpdatingEvent`]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 80%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc
index a18e6c8..a12cc6e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectCreatedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib-svc:FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib-svc:FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
`ObjectCreatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 85%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc
index 18aab3a..4a15079 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectLoadedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is retrieved from the database.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is retrieved from the database.
`ObjectLoadedEvent.Default` is the concrete implementation that is used.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc
index aa20248..bb6968e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistedEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
`ObjectPersistedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc
index 734c7e8..4438c5e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectPersistingEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
`ObjectPersistingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 79%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc
index 978bfa1..93a6052 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectRemovingEvent.adoc
@@ -5,7 +5,7 @@
:page-partial:
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
`ObjectRemovingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 88%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc
index 2b0fc0a..401c0e7 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatedEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object has just been updated in the database.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object has just been updated in the database.
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
`ObjectUpdatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 88%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc
index 6bfdb1f..febd85c 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/lifecycleevent/ObjectUpdatingEvent.adoc
@@ -6,7 +6,7 @@
-Subclass of xref:refguide:applib-cm:classes.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be updated in the database.
+Subclass of xref:applib-classes:about.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be updated in the database.
This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/menubars.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/menubars.adoc
similarity index 91%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/menubars.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/menubars.adoc
index 5daf323..c3deaa1 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/menubars.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/menubars.adoc
@@ -7,7 +7,7 @@
The `org.apache.isis.applib.layout.menubars` package and subpackages define a number of interfaces classes that allow the layout of domain service actions to be organised across menu bars, menus and menu sections.
The classes define a hierarchical structure of menu bars, menus and menu sections.
-Similar to the xref:refguide:applib-cm:classes/layout.adoc[object layout] classes, the concrete menu classes support bootstrap3; support for other layout systems is possible.
+Similar to the xref:applib-classes:classes/layout.adoc[object layout] classes, the concrete menu classes support bootstrap3; support for other layout systems is possible.
The component class `ServiceActionLayoutData` defines action metadata, being broadly equivalent to the "layout" annotations for actions, ie xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`].
This is similar to the `ActionLayoutData` component class used for object layouts, but also captures the identity of the "owning" domain service.
@@ -58,7 +58,7 @@ The service action class reside in the `org.apache.isis.applib.layout.component`
+
which correspond to the xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] annotation.
-This is similar to `ActionLayoutData` (of the xref:refguide:applib-cm:classes/layout.adoc[object layout] classes), however it also identifies the domain service to which it belongs.
+This is similar to `ActionLayoutData` (of the xref:applib-classes:classes/layout.adoc[object layout] classes), however it also identifies the domain service to which it belongs.
(This isn't required for the object layouts because the owner in that case is implicit).
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/mixins.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Dto.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Dto.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Dto.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Dto.adoc
index 062ce66..3a835ca 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Dto.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Dto.adoc
@@ -38,7 +38,7 @@ public class Dto_downloadXml {
<1> provided as an action to any class that (trivially) implements the `Dto` interface
<2> The action's name is derived from the class name.
-This will return the XML text wrapped up in a xref:refguide:applib-cm:classes.adoc#Clob[`Clob`].
+This will return the XML text wrapped up in a xref:applib-classes:about.adoc#Clob[`Clob`].
The `Dto_downloadXsd` mixin is similar:
@@ -53,8 +53,8 @@ public class Dto_downloadXsd {
<1> provided as an action to any class that (trivially) implements the `Dto` interface
<2> The action's name be derived from the class name.
-If the domain object's JAXB annotations reference only a single XSD schema then this will return that XML text as a xref:refguide:applib-cm:classes.adoc#Clob[`Clob`] of that XSD.
-If there are multiple XSD schemas referenced then the action will return a zip of those schemas, wrapped up in a xref:refguide:applib-cm:classes.adoc#Blob[`Blob`].
+If the domain object's JAXB annotations reference only a single XSD schema then this will return that XML text as a xref:applib-classes:about.adoc#Clob[`Clob`] of that XSD.
+If there are multiple XSD schemas referenced then the action will return a zip of those schemas, wrapped up in a xref:applib-classes:about.adoc#Blob[`Blob`].
The `IsisSchemas` parameter to the action can be used to optionally ignore the common xref:refguide:schema:about.adoc[Apache Isis schemas] (useful if there is only one other XSD schema referenced by the DTO).
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Object.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Object.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Object.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Object.adoc
index 93251fc..59d35d3 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Object.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Object.adoc
@@ -9,7 +9,7 @@ The framework provides a single mixin that contributes to simply `java.lang.Obje
It provides the ability to download the layout XML for any domain object (in practical terms: entities and view models).
These mixin actions are all associated with the "Metadata" fieldset.
-A number of other xref:refguide:applib-cm:classes.adoc#Persistable[mixins] also contribute properties or actions to the "Metadata" fieldset.
+A number of other xref:applib-classes:about.adoc#Persistable[mixins] also contribute properties or actions to the "Metadata" fieldset.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Persistable.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Persistable.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Persistable.adoc
index 2f58689..91b3468 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/mixins/Persistable.adoc
@@ -9,7 +9,7 @@ All domain entities automatically implement the DataNucleus `Persistable` role i
So as a developer you do not need to write any code to obtain the mixins that contribute to this interface.
These mixin properties/actions are all associated with the "Metadata" fieldset.
-A number of other xref:refguide:applib-cm:classes.adoc#Object[mixins] also contribute properties or actions to the "Metadata" fieldset.
+A number of other xref:applib-classes:about.adoc#Object[mixins] also contribute properties or actions to the "Metadata" fieldset.
@@ -33,7 +33,7 @@ public Clob downloadJdoMetadata( // <.>
// ...
}
----
-<.> returns the XML text wrapped up in a xref:refguide:applib-cm:classes.adoc#Clob[`Clob`].
+<.> returns the XML text wrapped up in a xref:applib-classes:about.adoc#Clob[`Clob`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedAt.adoc
similarity index 90%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedAt.adoc
index a11d898..abe0a28 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedAt.adoc
@@ -20,7 +20,7 @@ public interface HoldsUpdatedAt {
The current time is obtained from the xref:refguide:applib-svc:ClockService.adoc[`ClockService`].
-Entities that implement this interface often also implement xref:refguide:applib-cm:classes.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] role interface; as a convenience the xref:refguide:applib-cm:classes.adoc#Timestampable[`Timestampable`] interface combines the two roles.
+Entities that implement this interface often also implement xref:applib-classes:about.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] role interface; as a convenience the xref:applib-classes:about.adoc#Timestampable[`Timestampable`] interface combines the two roles.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedBy.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedBy.adoc
index 5f202d1..eb736d3 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/HoldsUpdatedBy.adoc
@@ -16,6 +16,6 @@ public interface HoldsUpdatedBy {
}
----
-Entities that implement this interface often also implement xref:refguide:applib-cm:classes.adoc#HoldsUpdatedAt[`HoldsUpdatedAt`] role interface; as a convenience the xref:refguide:applib-cm:classes.adoc#Timestampable[`Timestampable`] interface combines the two roles.
+Entities that implement this interface often also implement xref:applib-classes:about.adoc#HoldsUpdatedAt[`HoldsUpdatedAt`] role interface; as a convenience the xref:applib-classes:about.adoc#Timestampable[`Timestampable`] interface combines the two roles.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/Timestampable.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/Timestampable.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/roles/Timestampable.adoc
index 01e46e7..b100129 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles/Timestampable.adoc
@@ -5,7 +5,7 @@
:page-partial:
-The `Timestampable` role interface is a convenience that combines the xref:refguide:applib-cm:classes.adoc#HoldsUpdatedAt[`HoldsUpdatedAt`] and xref:refguide:applib-cm:classes.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] interfaces.
+The `Timestampable` role interface is a convenience that combines the xref:applib-classes:about.adoc#HoldsUpdatedAt[`HoldsUpdatedAt`] and xref:applib-classes:about.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] interfaces.
It is defined as:
// TODO: v2: use include::[]
@@ -25,4 +25,4 @@ The interface no additional methods of its own.
An alternative way to maintain a timestamp is to use JDO's `@Version` annotation.
With this approach, it is the JDO/DataNucleus that maintains the version, rather than the framework's `TimestampService`.
-See xref:refguide:applib-cm:classes.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] for further details.
+See xref:applib-classes:about.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] for further details.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/spec.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
similarity index 98%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/spec.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
index 0f67e02..019965e 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/spec.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
@@ -51,7 +51,7 @@ public class Customer {
== `Specification2`
The `Specification2` interface extends the `Specification` API to add support for i18n.
-This is done by defining an additional method that returns a xref:refguide:applib-cm:classes.adoc#TranslatableString[translatable string]:
+This is done by defining an additional method that returns a xref:applib-classes:about.adoc#TranslatableString[translatable string]:
[source,java]
----
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc
similarity index 76%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc
index 76e7ddd..fa812fe 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent.adoc
@@ -20,23 +20,23 @@ They are listed in the table below.
|Notes
-|xref:refguide:applib-cm:classes.adoc#TitleUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#TitleUiEvent[`o.a.i.applib.` +
`TitleUiEvent`]
|(abstract class). +
`TitleUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#titleUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain a title for a domain object. Note that if the domain object defines its own xref:refguide:applib-cm:methods.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
+|Broadcast whenever there is a requirement to obtain a title for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
-|xref:refguide:applib-cm:classes.adoc#IconUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#IconUiEvent[`o.a.i.applib.` +
`IconUiEvent`]
|(abstract class). +
`IconUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#iconUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain an icon (or rather, the name of an icon) for a domain object. Note that if the domain object defines its own xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`] supporting method, or if it has the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
+|Broadcast whenever there is a requirement to obtain an icon (or rather, the name of an icon) for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
-|xref:refguide:applib-cm:classes.adoc#CssClassUiEvent[`o.a.i.applib.` +
+|xref:applib-classes:about.adoc#CssClassUiEvent[`o.a.i.applib.` +
`CssClassUiEvent`]
|(abstract class). +
`CssClassUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#cssClassUiEvent` attribute is specified
-|Broadcast whenever there is a requirement to obtain a CSS class hint for a domain object. Note that if the domain object defines its own xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`] supporting method then this
+|Broadcast whenever there is a requirement to obtain a CSS class hint for a domain object. Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`] supporting method then this
will take precedence.
|===
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/CssClassUiEvent.adoc
similarity index 88%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/uievent/CssClassUiEvent.adoc
index 5ca74d4..8fe3f3f 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/CssClassUiEvent.adoc
@@ -14,4 +14,4 @@ The class has a number of responsibilities:
The class itself is instantiated automatically by the framework whenever interacting with a rendered object's action.
-If the domain object defines its own xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`] supporting method then this will take precedence.
+If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`] supporting method then this will take precedence.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/IconUiEvent.adoc
similarity index 90%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/uievent/IconUiEvent.adoc
index 7932d4f..0b60ade 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/IconUiEvent.adoc
@@ -14,6 +14,6 @@ The class has a number of responsibilities:
The class itself is instantiated automatically by the framework whenever interacting with a rendered object's action.
-If the domain object defines its own xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`] supporting method, or if it has the
+If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the
xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
r
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/TitleUiEvent.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/uievent/TitleUiEvent.adoc
index aa6c2bb..68bc5ad 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/uievent/TitleUiEvent.adoc
@@ -14,4 +14,4 @@ The class has a number of responsibilities:
The class itself is instantiated automatically by the framework whenever interacting with a rendered object's action.
-If the domain object defines its own xref:refguide:applib-cm:methods.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
+If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Enums.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility/Enums.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Enums.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/utility/Enums.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility/ObjectContracts.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/utility/ObjectContracts.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Reasons.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility/Reasons.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Reasons.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/utility/Reasons.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility/TitleBuffer.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/utility/TitleBuffer.adoc
index 89d7cba..38732ba 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/utility/TitleBuffer.adoc
@@ -5,7 +5,7 @@
:page-partial:
-The `TitleBuffer` utility class is intended to make it easy to construct title strings (returned from the xref:refguide:applib-cm:methods.adoc#title[`title()`] method).
+The `TitleBuffer` utility class is intended to make it easy to construct title strings (returned from the xref:refguide:applib-methods:reserved.adoc#title[`title()`] method).
For example, it has overloaded versions of methods called `append()` and `concat()`.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/value-types.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Blob.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Blob.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Blob.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Blob.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Clob.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Clob.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Clob.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Clob.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Markup.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Markup.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Markup.adoc
rename to api/applib/src/main/adoc/modules/applib-classes/pages/value-types/Markup.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
new file mode 100644
index 0000000..12a839a
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-classes/partials/module-nav.adoc
@@ -0,0 +1,6 @@
+
+
+
+* xref:applib-classes:about.adoc[Classes]
+
+
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc
deleted file mode 100644
index 4f83412..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-= Classes & Methods
-
-: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 [...]
-
-
-This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically reserved and prefix xref:refguide:applib-cm:methods.adoc[methods] (such as `title()` and `validate...()`) and various utility and supporting xref:refguide:applib-cm:classes.adoc[classes].
-
-It also describes the xref:refguide:schema:about.adoc[XSD schema] defined by Apache Isis.
-One use case is for the JAXB serialization of view models.
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc
deleted file mode 100644
index b62469a..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-[[created]]
-= `created()`
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-The `created()` lifecycle callback method is called when an object has just been created using xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#instantiate(...)`] or xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#instantiate(...)`]
-
-
-[TIP]
-====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectCreatedEvent[`ObjectCreatedEvent`].
-====
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
deleted file mode 100644
index 09c72d3..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
+++ /dev/null
@@ -1,50 +0,0 @@
-[[jdo-api]]
-= Using the JDO API
-
-: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 [...]
-
-
-
-As an alternative to relying on Apache Isis to call lifecycle callback methods, you could instead use the JDO link:http://www.datanucleus.org/products/datanucleus/jdo/lifecycle_callbacks.html[lifecycle listener] API directly.
-
-[NOTE]
-====
-We may decide to deprecate the Apache Isis callbacks in the future because they merely duplicate this functionality already available in JDO.
-====
-
-You can gain access to the relevant JDO API using the xref:pjdo:ROOT:services/IsisJdoSupport.adoc[`IsisJdoSupport`] domain service.
-
-For example:
-
-[source,java]
-----
-import org.springframework.stereotype.Service;
-
-@IsisSessionScope // <.>
-@Service
-public class ObjectChangedListenerService
- implements javax.jdo.listener.StoreLifecycleListener { // <.>
- @PostConstruct
- public void init() {
- getPmFactory().addInstanceLifecycleListener(this);
- }
- @PreDestroy
- public void tidyUp() {
- getPmFactory().removeInstanceLifecycleListener(this);
- }
- private PersistenceManager getPersistenceManager() {
- return jdoSupport.getPersistenceManager(); // <.>
- }
- public void preStore (InstanceLifecycleEvent event) { /* ... */ }
- public void postStore (InstanceLifecycleEvent event) { /* ... */ }
- @Inject
- IsisJdoSupport jdoSupport;
-}
-----
-<.> must be `@IsisSessionScope` because we register on the `PersistenceManager`, which is different for each request.
-<.> implement whichever callback lifecycle listeners are of interest
-<.> use the injected xref:pjdo:ROOT:services/IsisJdoSupport.adoc[`IsisJdoSupport`] service to obtain the `PersistenceManager`.
-
-Note that it isn't possible to register on the `PersistenceManagerFactory` because listeners cannot be attached once a persistence session has been created (which it will have been when the service's `@PostConstruct` method is called).
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
deleted file mode 100644
index bcac194..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[[removed]]
-= `removed()`
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-The `removed()` lifecycle callback method is called when a (persistent) object has just been deleted from the object store
-
-See also xref:refguide:applib-cm:methods.adoc#removing[`removing()`].
-
-[TIP]
-====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectRemovedEvent[`ObjectRemovedEvent`].
-====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc
deleted file mode 100644
index c49d812..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc
+++ /dev/null
@@ -1,217 +0,0 @@
-= Supporting Method Prefixes
-
-: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 [...]
-:page-partial:
-
-
-Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members.
-
-This association is performed by name matching. Thus, a property called "firstName", derived from a method `getFirstName()` may have supporting methods `hideFirstName()`, `disableFirstName()` and `validateFirstName()`. Supporting methods are, therefore, each characterized by their own particular prefix.
-
-
-[NOTE]
-====
-Using name matching to associate supporting methods generally works very well, but of course if an object member's method is renamed, there's always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".
-
-Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located. A suitable error message is logged so that the issue can be easily diagnosed.
-====
-
-
-The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.
-
-.Recognized Method Prefixes
-[cols="2,1,1,1,1,1,4a", options="header"]
-|===
-
-|Prefix
-|Object
-|Property
-|Collection
-|Action
-|Action +
-Param
-|Description
-
-|xref:refguide:applib-cm:methods.adoc#addTo[`addTo...()`]
-|
-|
-|Y
-|
-|
-|add object to a collection +
-
-[NOTE]
-====
-Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
-====
-
-See also xref:refguide:applib-cm:methods.adoc#removeFrom[`removeFrom...()`]`
-
-
-|xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`]
-|
-|Y
-|
-|
-|Y
-|Return a list of matching elements for a property or an action parameter. +
-
-Alternatively, can specify for a class using xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject` +
-`#autoCompleteRepository`] +
-
-See also xref:refguide:applib-cm:methods.adoc#choices[`choices...()`]
-
-|xref:refguide:applib-cm:methods.adoc#choices[`choices...()`]
-|
-|Y
-|
-|
-|Y
-|Provide list of choices for a property or action parameter. +
-
-See also xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`].
-
-|xref:refguide:applib-cm:methods.adoc#clear[`clear...()`]
-|
-|Y
-|
-|
-|
-|Clear a property (set it to null). +
-
-Allows business logic to be placed apart from the setter. +
-
-See also xref:refguide:applib-cm:methods.adoc#modify[`modify...()`]
-
-
-|xref:refguide:applib-cm:methods.adoc#default[`default...()`]
-|
-|Y
-|
-|
-|Y
-|Default value for a property or an action parameter.
-
-|xref:refguide:applib-cm:methods.adoc#disable[`disable...()`]
-|Y
-|Y
-|Y
-|Y
-|
-|Disables (makes read-only) a property, a collection or an action.
-
-|xref:refguide:applib-cm:methods.adoc#get[`get...()`]
-|
-|Y
-|Y
-|
-|
-|Access the value of a property or collection. +
-
-See also xref:refguide:applib-cm:methods.adoc#set[`set...()`].
-
-|xref:refguide:applib-cm:methods.adoc#hide[`hide...()`]
-|
-|Y
-|Y
-|Y
-|
-|Hides a property, a collection or an action.
-
-|xref:refguide:applib-cm:methods.adoc#modify[`modify...()`]
-|
-|Y
-|
-|
-|
-|Modify a property (set it to a non-null) value. +
-
-Allows business logic to be placed apart from the setter. +
-
-See also xref:refguide:applib-cm:methods.adoc#clear[`clear...()`]`.
-
-|xref:refguide:applib-cm:methods.adoc#removeFrom[`removeFrom...()`]
-|
-|
-|Y
-|
-|
-|remove object from a collection. +
-
-[NOTE]
-====
-Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
-====
-
-See also xref:refguide:applib-cm:methods.adoc#addTo[`addTo...()`]`
-
-
-|xref:refguide:applib-cm:methods.adoc#set[`set...()`]
-|
-|Y
-|Y
-|
-|
-|Sets the value of a property or a collection.
-
-|xref:refguide:applib-cm:methods.adoc#validate[`validate...()`]
-|Y
-|
-|
-|Y
-|Y
-|Check that a proposed value of a property or a set of action parameters or a single action parameter is valid. +
-
-See also xref:refguide:applib-cm:methods.adoc#validateAddTo[`validateAddTo...()`] and xref:refguide:applib-cm:methods.adoc#validateRemoveFrom[`validateRemoveFrom...()`] to validate modifications to collections.
-
-|xref:refguide:applib-cm:methods.adoc#validateAddTo[`validate +
-AddTo...()`]
-|
-|Y
-|
-|
-|
-|Check that a proposed object to add to a collection is valid. +
-
-[NOTE]
-====
-Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
-====
-
-See also xref:refguide:applib-cm:methods.adoc#validateRemoveFrom[`validateRemoveFrom...()`], and xref:refguide:applib-cm:methods.adoc#validate[`validate...()`] for properties and actions.
-
-|xref:refguide:applib-cm:methods.adoc#validateRemoveFrom[`validate +
-RemoveFrom...()`]
-|
-|Y
-|
-|
-|
-|Check that a proposed object to remove from a collection is valid. +
-
-[NOTE]
-====
-Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
-====
-
-See also xref:refguide:applib-cm:methods.adoc#validateAddTo[`validateAddTo...()`], and xref:refguide:applib-cm:methods.adoc#validate[`validate...()`] for properties and actions.
-
-|===
-
-
-
-
-include::prefixes/addTo.adoc[leveloffset=+1]
-include::prefixes/autoComplete.adoc[leveloffset=+1]
-include::prefixes/choices.adoc[leveloffset=+1]
-include::prefixes/clear.adoc[leveloffset=+1]
-include::prefixes/default.adoc[leveloffset=+1]
-include::prefixes/disable.adoc[leveloffset=+1]
-include::prefixes/get.adoc[leveloffset=+1]
-include::prefixes/hide.adoc[leveloffset=+1]
-include::prefixes/modify.adoc[leveloffset=+1]
-include::prefixes/removeFrom.adoc[leveloffset=+1]
-include::prefixes/set.adoc[leveloffset=+1]
-include::prefixes/validate.adoc[leveloffset=+1]
-include::prefixes/validateAddTo.adoc[leveloffset=+1]
-include::prefixes/validateRemoveFrom.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/rgcms.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/rgcms.adoc
deleted file mode 100644
index bc57e78..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/rgcms.adoc
+++ /dev/null
@@ -1,7 +0,0 @@
-= Classes & Methods
-
-: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 [...]
-
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc
deleted file mode 100644
index 74d5e23..0000000
--- a/api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-* xref:refguide:applib-cm:about.adoc[Classes & Methods]
-
-** xref:refguide:applib-cm:methods.adoc[Methods]
-** xref:refguide:applib-cm:classes.adoc[Classes]
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples.sh b/api/applib/src/main/adoc/modules/applib-methods/examples.sh
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples.sh
rename to api/applib/src/main/adoc/modules/applib-methods/examples.sh
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java b/api/applib/src/main/adoc/modules/applib-methods/examples/clock/Clock.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/clock/Clock.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/clock/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/clock/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/adoc/modules/applib-methods/examples/domain/DomainObjectList.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/domain/DomainObjectList.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ActionArgumentUsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ActionArgumentUsabilityEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ActionArgumentVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ActionArgumentVisibilityEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/EventObjectBase.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/EventObjectBase.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/EventObjectBase.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/EventObjectBase.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/AbstractDomainEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/AbstractDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/ActionDomainEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/ActionDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/CollectionDomainEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/CollectionDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/PropertyDomainEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/domain/PropertyDomainEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/AbstractLifecycleEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/AbstractLifecycleEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectCreatedEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectCreatedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectLoadedEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectLoadedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectPersistedEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectPersistedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectPersistingEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectPersistingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectRemovingEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectRemovingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectUpdatedEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectUpdatedEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectUpdatingEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/lifecycle/ObjectUpdatingEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/AbstractUiEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/AbstractUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/CssClassUiEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/CssClassUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/IconUiEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/IconUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/LayoutUiEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/LayoutUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/TitleUiEvent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/events/ui/TitleUiEvent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/Edge.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/Edge.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/Edge.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/Edge.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/SimpleEdge.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/SimpleEdge.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/SimpleEdge.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/SimpleEdge.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/Vertex.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/Vertex.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/Vertex.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/Vertex.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/LazyTreeNode.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/LazyTreeNode.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/LazyTreeNode.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/LazyTreeNode.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeAdapter.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeAdapter.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeAdapter.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeAdapter.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorBreadthFirst.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorBreadthFirst.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorDepthFirst.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorDepthFirst.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorDepthFirst.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorDepthFirst.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorHierarchyUp.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeNode_iteratorHierarchyUp.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreePath.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreePath.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath_Default.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreePath_Default.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreePath_Default.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreePath_Default.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeState.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeState.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState_Default.java b/api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeState_Default.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/graph/tree/TreeState_Default.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/graph/tree/TreeState_Default.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ActionLayoutData.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ActionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ActionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ActionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CollectionLayoutData.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CollectionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CollectionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CollectionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CssClassFaPosition.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CssClassFaPosition.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CssClassFaPosition.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/CssClassFaPosition.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/DomainObjectLayoutData.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/DomainObjectLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/DomainObjectLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/DomainObjectLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/FieldSet.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/FieldSet.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/FieldSetOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/FieldSetOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasBookmarking.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasBookmarking.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasCssClass.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasCssClass.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasCssClassFa.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasCssClassFa.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasDescribedAs.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasDescribedAs.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasHidden.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasHidden.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasNamed.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/HasNamed.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/MemberRegion.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/MemberRegion.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/MemberRegionOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/MemberRegionOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/Owned.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/Owned.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/Owner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/Owner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/PropertyLayoutData.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/PropertyLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ServiceActionLayoutData.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ServiceActionLayoutData.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ServiceActionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/ServiceActionLayoutDataOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/component/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/Grid.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/Grid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/GridAbstract.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/GridAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFix.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFix.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Col.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Col.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Element.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Element.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Grid.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Grid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Row.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Row.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowContent.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowContent.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3RowOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Tab.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3Tab.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabGroup.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabGroup.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabOwner.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/BS3TabOwner.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/HasCssId.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/HasCssId.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/Size.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/Size.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/SizeSpan.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/SizeSpan.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/WithinGrid.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/WithinGrid.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/grid/bootstrap3/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/links/Link.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/links/Link.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/links/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/links/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/Menu.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/Menu.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBar.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBar.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBars.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBars.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBarsAbstract.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuBarsAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuSection.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/MenuSection.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3Menu.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3Menu.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuBar.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuBar.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuBars.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuBars.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuSection.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/BS3MenuSection.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/menubars/bootstrap3/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/layout/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/layout/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/MixinConstants.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/MixinConstants.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto_downloadXml.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto_downloadXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto_downloadXsd.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/Dto_downloadXsd.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/dto/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_downloadLayoutXml.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_downloadLayoutXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_openRestApi.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_openRestApi.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_rebuildMetamodel.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/layout/Object_rebuildMetamodel.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_downloadMetaModelXml.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_downloadMetaModelXml.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_objectIdentifier.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_objectIdentifier.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_objectType.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/metamodel/Object_objectType.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/HoldsUpdatedAt.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/HoldsUpdatedAt.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/HoldsUpdatedBy.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/HoldsUpdatedBy.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/Timestampable.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/Timestampable.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/mixins/timestamp/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/AbstractSpecification.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/AbstractSpecification.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/AbstractSpecification2.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/AbstractSpecification2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/Specification.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/Specification.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/Specification2.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/Specification2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationAnd.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationAnd.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationNot.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationNot.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationOr.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/SpecificationOr.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/spec/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/spec/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/Enums.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/Enums.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/Equality.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/Equality.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/Hashing.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/Hashing.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/JaxbAdapters.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/JaxbAdapters.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/JaxbUtil.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/JaxbUtil.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Empty.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Empty.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Impl.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Impl.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Parser.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContract_Parser.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContracts.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ObjectContracts.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ReasonBuffer.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ReasonBuffer.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ReasonBuffer2.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ReasonBuffer2.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/Reasons.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/Reasons.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/TitleBuffer.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/TitleBuffer.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/TitleBufferException.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/TitleBufferException.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ToString.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ToString.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/ZipWriter.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/ZipWriter.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/ChangesDtoUtils.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/ChangesDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/CommandDtoUtils.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/CommandDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/CommonDtoUtils.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/CommonDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/InteractionDtoUtils.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/InteractionDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/MemberExecutionDtoUtils.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/util/schema/MemberExecutionDtoUtils.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/Blob.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/Blob.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/Clob.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/Clob.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/Image.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/Image.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/LocalResourcePath.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/LocalResourcePath.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/Markup.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/Markup.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/NamedWithMimeType.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/NamedWithMimeType.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/Password.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/Password.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java b/api/applib/src/main/adoc/modules/applib-methods/examples/value/package-info.java
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java
rename to api/applib/src/main/adoc/modules/applib-methods/examples/value/package-info.java
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png b/api/applib/src/main/adoc/modules/applib-methods/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-classes/issue-in-more-detail.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png b/api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/prefixes/choices/dependent.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png b/api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn b/api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png b/api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/differing.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png b/api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/reference-methods/reserved/iconName/png-files.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png b/api/applib/src/main/adoc/modules/applib-methods/images/value-types/markup.png
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png
rename to api/applib/src/main/adoc/modules/applib-methods/images/value-types/markup.png
diff --git a/api/applib/src/main/adoc/modules/applib-cm/nav.adoc b/api/applib/src/main/adoc/modules/applib-methods/nav.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/nav.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/nav.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/about.adoc
similarity index 78%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/about.adoc
index 4fac1d3..b9841e8 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/about.adoc
@@ -6,10 +6,7 @@
The Apache Isis metamodel is built up from declaratively (ie, xref:refguide:applib-ant:about.adoc[annotations]) and imperatively, from "supporting" methods and other reserved methods.
-This chapter documents the supporting methods and the reserved methods. It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.
+This chapter documents the supporting methods and the reserved methods.
+It also documents the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.
-
-include::methods/prefixes.adoc[leveloffset=+1]
-include::methods/reserved.adoc[leveloffset=+1]
-include::methods/lifecycle.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
similarity index 59%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
index f0ebfaf..ba0349d 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
@@ -8,56 +8,49 @@
The lifecycle callback methods notify a domain entity about its interaction within the persistence lifecycle.
For example, the entity is notified immediately prior to being persisted, or when it is about to be updated.
-[WARNING]
-====
-Note that these callbacks are fired by Apache Isis rather than JDO.
-In the future we may deprecate them because there are better mechanisms available using a subscriber for the xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle event]s.
-====
-
The lifecycle callback methods supported by Apache Isis are:
.Lifecycle methods (partial support)
-[cols="1,4a", options="header"]
+[cols="1m,4a,1m", options="header"]
|===
|Method
|Description
+|Event +
+equivalent
-|xref:refguide:applib-cm:methods.adoc#created[`created()`]
+|created()
|called when an object has just been created using xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(..)`] or xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]
+|xref:applib-classes:about.adoc#ObjectCreatedEvent[ObjectCreatedEvent]
-|xref:refguide:applib-cm:methods.adoc#loaded[`loaded()`]
+|loaded()
|called when a (persistent) object has just been loaded from the object store.
+|xref:applib-classes:about.adoc#ObjectLoadedEvent[ObjectLoadedEvent]
-|xref:refguide:applib-cm:methods.adoc#persisted[`persisted()`]
+|persisted()
|called when object has just been persisted from the object store.
+|xref:applib-classes:about.adoc#ObjectPersistedEvent[ObjectPersistedEvent]
-|xref:refguide:applib-cm:methods.adoc#persisting[`persisting()`]
+|persisting()
|called when a (not-yet-persistent) object is just about to be persisted from the object store
+|xref:applib-classes:about.adoc#ObjectPersistingEvent[ObjectPersistingEvent]
-|xref:refguide:applib-cm:methods.adoc#removed[`removed()`]
-|called when a (persistent) object has just been deleted from the object store
-
-|xref:refguide:applib-cm:methods.adoc#removing[`removing()`]
+|removing()
|called when a (persistent) object is just about to be deleted from the object store
+|xref:applib-classes:about.adoc#ObjectRemovingEvent[ObjectRemovingEvent]
-|xref:refguide:applib-cm:methods.adoc#updated[`updated()`]
+|updated()
|called when a (persistent) object has just been updated in the object store
+|xref:applib-classes:about.adoc#ObjectUpdatedEvent[ObjectUpdatedEvent]
-|xref:refguide:applib-cm:methods.adoc#updating[`updating()`]
+|updating()
|called when a (persistent) object is just about to be updated in the object store
+|xref:applib-classes:about.adoc#ObjectUpdatingEvent[ObjectUpdatingEvent]
|===
+[TIP]
+====
+A more flexible/decoupled design is to implement a subscriber to the equivalent xref:applib-classes:about.adoc#lifecycle-events[lifecycle event]s.
+====
-
-
-include::lifecycle/created.adoc[leveloffset=+1]
-include::lifecycle/loaded.adoc[leveloffset=+1]
-include::lifecycle/persisted.adoc[leveloffset=+1]
-include::lifecycle/persisting.adoc[leveloffset=+1]
-include::lifecycle/removed.adoc[leveloffset=+1]
-include::lifecycle/removing.adoc[leveloffset=+1]
-include::lifecycle/updated.adoc[leveloffset=+1]
-include::lifecycle/updating.adoc[leveloffset=+1]
-include::lifecycle/jdo-api.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc
new file mode 100644
index 0000000..e69de29
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
similarity index 89%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
index 2053d20..21f85fb 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
@@ -10,5 +10,5 @@ The `loaded()` lifecycle callback method is called when a (persistent) object ha
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectLoadedEvent[`ObjectLoadedEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
index 06cb6d8..2164388 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
@@ -7,9 +7,9 @@
The `persisted()` lifecycle callback method is called when object has just been persisted from the object store.
-See also xref:refguide:applib-cm:methods.adoc#persisting[`persisting()`].
+See also xref:refguide:applib-methods:lifecycle.adoc#persisting[`persisting()`].
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectPersistedEvent[`ObjectPersistedEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
index 19deca3..289cda5 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
@@ -7,9 +7,9 @@
The `persisting()` lifecycle callback method is called when a (not-yet-persistent) object is just about to be persisted from the object store
-See also xref:refguide:applib-cm:methods.adoc#persisted[`persisted()`].
+See also xref:refguide:applib-methods:lifecycle.adoc#persisted[`persisted()`].
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectPersistingEvent[`ObjectPersistingEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removing.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
index 112d1bc..3293080 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
@@ -7,9 +7,9 @@
The `removing()` lifecycle callback method is called when a (persistent) object is just about to be deleted from the object store
-See also xref:refguide:applib-cm:methods.adoc#removed[`removed()`].
+See also xref:refguide:applib-methods:lifecycle.adoc#removed[`removed()`].
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectRemovingEvent[`ObjectRemovingEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updated.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
index ff343d2..e92ecdc 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
@@ -9,9 +9,9 @@
The `updated()` lifecycle callback method is called when a (persistent) object has just been updated in the object store
-See also xref:refguide:applib-cm:methods.adoc#updating[`updating()`].
+See also xref:refguide:applib-methods:lifecycle.adoc#updating[`updating()`].
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectUpdatedEvent[`ObjectUpdatedEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updating.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
similarity index 83%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
index bce0a4d..ee86b60 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
@@ -6,9 +6,9 @@
The `updating()` lifecycle callback method is called when a (persistent) object is just about to be updated in the object store
-See also xref:refguide:applib-cm:methods.adoc#updated[`updated()`].
+See also xref:refguide:applib-methods:lifecycle.adoc#updated[`updated()`].
[TIP]
====
-Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the xref:refguide:applib-cm:classes.adoc#ObjectUpdatingEvent[`ObjectUpdatingEvent`].
+Alternatively, consider using a xref:refguide:applib-svc:EventBusService.adoc[event bus] subscriber on the .
====
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
new file mode 100644
index 0000000..786b151
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
@@ -0,0 +1,212 @@
+= Supporting Method Prefixes
+
+: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 [...]
+:page-partial:
+
+
+Supporting methods are those that are associated with properties, collections and actions, providing additional imperative business rule checking and behaviour to be performed when the user interacts with those object members.
+
+This association is performed by name matching.
+Thus, a property called "firstName", derived from a method `getFirstName()` may have supporting methods `hideFirstName()`, `disableFirstName()` and `validateFirstName()`.
+Supporting methods are, therefore, each characterized by their own particular prefix.
+
+
+The table below lists the method prefixes that are recognized as part of Apache Isis' default programming model.
+
+.Recognized Method Prefixes
+[cols="2,1,1,1,1,1,4a",options="header"]
+|===
+
+|Prefix
+|Object
+|Property
+|Collection
+|Action
+|Action +
+Param
+|Description
+
+//|xref:refguide:applib-methods:prefixes.adoc#addTo[`addTo...()`]
+//|
+//|
+//|Y
+//|
+//|
+//|add object to a collection +
+//
+//NOTE: Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#removeFrom[`removeFrom...()`]`
+
+
+|xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`]
+|
+|Y
+|
+|
+|Y
+|Return a list of matching elements for a property or an action parameter. +
+
+Alternatively, can specify for a class using xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject` +
+`#autoCompleteRepository`] +
+
+See also xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`]
+
+|xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`]
+|
+|Y
+|
+|
+|Y
+|Provide list of choices for a property or action parameter. +
+
+See also xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`].
+
+//|xref:refguide:applib-methods:prefixes.adoc#clear[`clear...()`]
+//|
+//|Y
+//|
+//|
+//|
+//|Clear a property (set it to null). +
+//
+//Allows business logic to be placed apart from the setter. +
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#modify[`modify...()`]
+
+
+|xref:refguide:applib-methods:prefixes.adoc#default[`default...()`]
+|
+|Y
+|
+|
+|Y
+|Default value for a property or an action parameter.
+
+|xref:refguide:applib-methods:prefixes.adoc#disable[`disable...()`]
+|Y
+|Y
+|Y
+|Y
+|
+|Disables (makes read-only) a property, a collection or an action.
+
+|xref:refguide:applib-methods:prefixes.adoc#get[`get...()`]
+|
+|Y
+|Y
+|
+|
+|Access the value of a property or collection. +
+
+See also xref:refguide:applib-methods:prefixes.adoc#set[`set...()`].
+
+|xref:refguide:applib-methods:prefixes.adoc#hide[`hide...()`]
+|
+|Y
+|Y
+|Y
+|
+|Hides a property, a collection or an action.
+
+//|xref:refguide:applib-methods:prefixes.adoc#modify[`modify...()`]
+//|
+//|Y
+//|
+//|
+//|
+//|Modify a property (set it to a non-null) value. +
+//
+//Allows business logic to be placed apart from the setter. +
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#clear[`clear...()`]`.
+
+//|xref:refguide:applib-methods:prefixes.adoc#removeFrom[`removeFrom...()`]
+//|
+//|
+//|Y
+//|
+//|
+//|remove object from a collection. +
+//
+//NOTE:Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#addTo[`addTo...()`]`
+
+
+|xref:refguide:applib-methods:prefixes.adoc#set[`set...()`]
+|
+|Y
+|Y
+|
+|
+|Sets the value of a property or a collection.
+
+//|xref:refguide:applib-methods:prefixes.adoc#validate[`validate...()`]
+//|Y
+//|
+//|
+//|Y
+//|Y
+//|Check that a proposed value of a property or a set of action parameters or a single action parameter is valid. +
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#validateAddTo[`validateAddTo...()`] and xref:refguide:applib-methods:prefixes.adoc#validateRemoveFrom[`validateRemoveFrom...()`] to validate modifications to collections.
+
+//|xref:refguide:applib-methods:prefixes.adoc#validateAddTo[`validate +
+//AddTo...()`]
+//|
+//|Y
+//|
+//|
+//|
+//|Check that a proposed object to add to a collection is valid. +
+//
+//[NOTE]
+//====
+//Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
+//====
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#validateRemoveFrom[`validateRemoveFrom...()`], and xref:refguide:applib-methods:prefixes.adoc#validate[`validate...()`] for properties and actions.
+
+//|xref:refguide:applib-methods:prefixes.adoc#validateRemoveFrom[`validate +
+//RemoveFrom...()`]
+//|
+//|Y
+//|
+//|
+//|
+//|Check that a proposed object to remove from a collection is valid. +
+//
+//[NOTE]
+//====
+//Directly mutable collections are not currently supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
+//====
+//
+//See also xref:refguide:applib-methods:prefixes.adoc#validateAddTo[`validateAddTo...()`], and xref:refguide:applib-methods:prefixes.adoc#validate[`validate...()`] for properties and actions.
+
+|===
+
+
+[NOTE]
+====
+Using name matching to associate supporting methods generally works very well, but of course if an object member's method is renamed, there's always the risk that the developer forgets to rename the supporting method; the supporting methods become "orphaned".
+
+Apache Isis checks for this automatically, and will fail-fast (fail to boot) if any orphaned methods are located.
+A suitable error message is logged so that the issue can be easily diagnosed.
+====
+
+
+//include::prefixes/addTo.adoc[leveloffset=+1]
+include::prefixes/autoComplete.adoc[leveloffset=+1]
+include::prefixes/choices.adoc[leveloffset=+1]
+//include::prefixes/clear.adoc[leveloffset=+1]
+include::prefixes/default.adoc[leveloffset=+1]
+include::prefixes/disable.adoc[leveloffset=+1]
+include::prefixes/get.adoc[leveloffset=+1]
+include::prefixes/hide.adoc[leveloffset=+1]
+//include::prefixes/modify.adoc[leveloffset=+1]
+//include::prefixes/removeFrom.adoc[leveloffset=+1]
+include::prefixes/set.adoc[leveloffset=+1]
+//include::prefixes/validate.adoc[leveloffset=+1]
+//include::prefixes/validateAddTo.adoc[leveloffset=+1]
+//include::prefixes/validateRemoveFrom.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
similarity index 75%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
index bfb182c..f22083c 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
@@ -9,7 +9,7 @@ The `autoComplete...()` supporting method is called for action parameters and fo
[TIP]
====
-If the number of candidate objects is comparatively small, then use xref:refguide:applib-cm:methods.adoc#choices[`choices...()`] supporting method instead.
+If the number of candidate objects is comparatively small, then use xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`] supporting method instead.
====
The signature of the supporting method depends on whether it is for a parameter or a property.
@@ -31,36 +31,38 @@ For example:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class ShoppingCartItem {
+
@Property(editing=Editing.DISABLED)
- public Product getProduct() { /* ... */ }
- public void setProduct(Product product) { /* ... */ }
+ @Getter @Setter
+ private Product product;
@Property(editing=Editing.DISABLED)
- public int getQuantity() { /* ... */ }
- public void setQuantity(int quantity) { /* ... */ }
+ @Getter @Setter
+ private int quantity;
@Action(semantics=SemanticsOf.IDEMPOTENT)
public ShoppingCartItem updateProduct(
- Product product,
- @ParameterLayout(named="Quantity")
- final int quantity) {
- setProduct(product);
- setQuantity(quantity);
+ final Product product,
+ final int quantity) {
+ // ...
}
- public Collection<Product> autoComplete0UpdateProduct( // <1>
- @MinLength(3) String search // <2>
- ) {
- ...
+ public Collection<Product> autoComplete0UpdateProduct( // <.>
+ @MinLength(3) // <.>
+ final String search ) {
+ // ...
}
- ...
+
+ // ...
}
----
-<1> `product` is the 0th argument of the action.
-<2> the xref:refguide:applib-ant:MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
-
+<.> `product` is the 0th argument of the action.
+<.> the xref:refguide:applib-ant:MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
== Properties
@@ -78,13 +80,16 @@ For example:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class ShoppingCartItem {
- public Product getProduct() { /* ... */ }
- public void setProduct(Product product) { /* ... */ }
+ @Getter @Setter
+ private Product product;
public Collection<Product> autoCompleteProduct(
- @MinLength(3) String search // <1>
- ) {
+ @MinLength(3) // <.>
+ final String search ) {
...
}
...
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/choices.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/choices.adoc
similarity index 82%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/choices.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/choices.adoc
index 15b6a6d..7398fd8 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/choices.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/choices.adoc
@@ -6,7 +6,7 @@
The `choices...()` supporting method is called for both action parameters and for properties, to find objects from a drop-down list box.
-Unlike xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`], the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.
+Unlike xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`], the use case is when the number of objects is comparatively small and can be selected from a drop-down without any additional filtering.
The signature of the supporting method depends on whether it is for an action parameter or a property.
@@ -29,6 +29,7 @@ import lombok.Getter;
import lombok.Setter;
public class ShoppingCartItem {
+
@Property(editing=Editing.DISABLED)
@Getter @Setter
private Product product;
@@ -39,16 +40,15 @@ public class ShoppingCartItem {
@Action(semantics=SemanticsOf.IDEMPOTENT)
public ShoppingCartItem updateProduct(
- Product product,
- @ParameterLayout(named="Quantity")
- final Integer quantity) {
- setProduct(product);
- setQuantity(quantity);
+ Product product,
+ final Integer quantity) {
+ // ...
}
public Collection<Integer> choices1UpdateProduct() {
return Arrays.asList(1,2,3,5,10,25,50,100);
}
- ...
+
+ // ...
}
----
@@ -87,7 +87,9 @@ public class ToDoItem {
}
----
+
<.> "choices" prefix, Nth param
+
<.> the category selected
@@ -100,19 +102,18 @@ public class ShoppingCartItem {
...
@Action(semantics=SemanticsOf.IDEMPOTENT)
public ShoppingCartItem updateProduct(
- Product product,
- @ParameterLayout(named="Quantity")
- final Integer quantity) {
- setProduct(product);
- setQuantity(quantity);
+ Product product,
+ final Integer quantity) {
+ // ...
}
public Collection<Integer> choices1UpdateProduct(Product product) {
- return productService.quantityChoicesFor(product); // <1>
+ return productService.quantityChoicesFor(product); // <.>
}
...
}
----
-<1> `productService` is a (fictitous) injected service that knows what the quantity choices should be for any given product
+
+<.> `productService` is a (fictitious) injected service that knows what the quantity choices should be for any given product
== Properties
@@ -127,13 +128,19 @@ For example:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class ShoppingCartItem {
- public Product getProduct() { /* ... */ }
- public void setProduct(Product product) { /* ... */ }
+
+ @Property(editing = Editing.ENABLED)
+ @Getter @Setter
+ private Product product;
public Collection<Product> choicesProduct() {
- ...
+ // ...
}
-----
-
+ // ...
+}
+----
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/default.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
similarity index 61%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/default.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
index 45c4334..5ee7cf3 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/default.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
@@ -8,55 +8,59 @@
The `default...()` supporting method is called for action parameters to return the initial argument value.
This may be some sensible default (eg today's date, or 0 or 1), or -- for an action that is modifying the state of an object -- might default to the current value of a corresponding property.
-The method is _also_ called for properties in the case when an object is newly instantiated using xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#instantiate(...)`] or xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#instantiate(...)`].
+The method is _also_ called for properties in the case when an object is newly instantiated using xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(...)`].
This is a much less common use case.
If a default is not specified then properties are initialized to a default based on their type (eg 0 or `false`).
The signature of the supporting method depends on whether it is for an action parameter or a property.
-
== Parameters
For an action parameter in (0-based position n), and of type `T`, the signature is:
[source,java]
----
-public T defaultNXxx() { /* ... */ }
+public T defaultNXxx() {
+ // ...
+}
----
-
For example:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class ShoppingCartItem {
+
@Property(editing=Editing.DISABLED)
- public Product getProduct() { /* ... */ }
- public void setProduct(Product product) { /* ... */ }
+ @Getter @Setter
+ private Product product;
@Property(editing=Editing.DISABLED)
- public int getQuantity() { /* ... */ }
- public void setQuantity(int quantity) { /* ... */ }
+ @Getter @Setter
+ private int quantity;
@Action(semantics=SemanticsOf.IDEMPOTENT)
public ShoppingCartItem updateProduct(
- Product product,
- @ParameterLayout(named="Quantity")
- final Integer quantity) {
- setProduct(product);
- setQuantity(quantity);
+ Product product,
+ final Integer quantity) {
+ // ...
}
- public Product default0UpdateProduct() { // <1>
+
+ public Product default0UpdateProduct() { // <.>
return getProduct();
}
- public int default1UpdateProduct() { // <2>
+ public int default1UpdateProduct() { // <.>
return getQuantity();
}
- ...
+
+ // ...
}
----
-<1> default the 0-th parameter using the current value of the `product` property
-<2> default the 1-th parameter using the current value of the `quantity` property
+<.> default the 0-th parameter using the current value of the `product` property
+<.> default the 1-th parameter using the current value of the `quantity` property
If implemented as a mixin xref:userguide:fun:mixins.adoc#contributed-action[contributed action], the code would look something like:
@@ -96,7 +100,6 @@ public class ToDoItem {
<.> defaults the 0-th parameter using the item's `category` property
<.> defaults the 1-th parameter using the item's `subcategory` property
-
=== Dependent Defaults
Action parameters also support the notion of dependent defaults, whereby the value of a default is dependent upon the value of some other previous argument.
@@ -115,75 +118,42 @@ public Integer default2Add(final Integer net, final Integer val) {
}
----
-As a more complex example (taken from the link:http://github.com/apache/isis-app-kitchensink[Isis addons' kitchensink] app), we can default the NFL region from the NFL league, and then the NFL team based on the region:
-
-[source,java]
-----
-public NflPlayer updateUsingEntity(
- final NflLeague league,
- @Nullable final NflRegion region,
- @Nullable final NflTeamEntity nflTeamEntity) {
-
- setLeague(league);
- setRegion(region);
- setTeamEnum(NflTeamEnum.lookup(nflTeamEntity));
- setTeamEntity(nflTeamEntity);
-
- return this;
-}
-
-public List<NflRegion> choices1UpdateUsingEntity(final NflLeague league) {
- return NflRegion.thoseFor(league);
-}
-public List<NflTeamEntity> choices2UpdateUsingEntity(final NflLeague league, final NflRegion region) {
- return nflTeams.thoseFor(region);
-}
-public NflLeague default0UpdateUsingEntity() {
- return getLeague();
-}
-public NflRegion default1UpdateUsingEntity(final NflLeague nflLeague) {
- return choices1UpdateUsingEntity(nflLeague).stream()
- .findFirst().orElse(null);
-}
-public NflTeamEntity default2UpdateUsingEntity(
- final NflLeague league, final NflRegion region) {
- return choices2UpdateUsingEntity(league, region).stream()
- .findFirst().orElse(null);
-}
-----
-
-In fact, in the example above the two `defaultNxxx` methods are not required; if a choices exists then the Wicket viewer will (now) ensure that the selected argument is compatible with the choices, and reset the argument to an empty value otherwise.
-
-
== Properties
For a property of type `T`, the signature is:
[source,java]
----
-public T defaultXxx() { /* ... */ }
+public T defaultXxx() {
+ // ...
+}
----
-
For example:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class ShoppingCartItem {
- public int getQuantity() { /* ... */ }
- public void setQuantity(int quantity) { /* ... */ }
- public int defaultProduct() {
+ @Getter @Setter
+ private int quantity;
+
+ public int defaultQuantity() {
return 1;
}
-----
+ // ...
+}
+----
=== Alternatives
There are, in fact, two other ways to set properties of a newly instantiated object to default values.
-The first is to use the xref:refguide:applib-cm:methods.adoc#created[`created()`] callback, called by the framework when xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#instantiate(...)`] or xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#instantiate(...)`] is called.
+The first is to use the xref:refguide:applib-methods:lifecycle.adoc#created[`created()`] callback, called by the framework when xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(...)`] is called.
This method is called after any services have been injected into the domain object.
The second is more straightforward: simply initialize properties in the constructor.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/addTo.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/addTo.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/addTo.adoc
index 9e0667e..08182f6 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/addTo.adoc
@@ -33,4 +33,4 @@ public class LibraryMember {
<2> perform some additional business logic
-See also xref:refguide:applib-cm:methods.adoc#removeFrom[`removeFrom...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#removeFrom[`removeFrom...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/clear.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/clear.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/clear.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/clear.adoc
index 4014cc3..d3a455a 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/clear.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/clear.adoc
@@ -33,4 +33,4 @@ public class LibraryMember {
<2> perform some additional business logic
-See also xref:refguide:applib-cm:methods.adoc#modify[`modify...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#modify[`modify...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/modify.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/modify.adoc
similarity index 96%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/modify.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/modify.adoc
index 4d11868..edafde2 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/modify.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/modify.adoc
@@ -37,6 +37,6 @@ public class LibraryMember {
<3> perform some additional business logic
-See also xref:refguide:applib-cm:methods.adoc#clear[`clear...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#clear[`clear...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/removeFrom.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/removeFrom.adoc
index 819cb61..82cb225 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/removeFrom.adoc
@@ -33,4 +33,4 @@ public class LibraryMember {
<2> perform some additional business logic
-See also xref:refguide:applib-cm:methods.adoc#addTo[`addTo...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#addTo[`addTo...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validate.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validate.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validate.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validate.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateAddTo.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateAddTo.adoc
index 937570e..d371091 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateAddTo.adoc
@@ -41,5 +41,5 @@ public class LibraryMember {
----
-See also xref:refguide:applib-cm:methods.adoc#addTo[`addTo...()`] and xref:refguide:applib-cm:methods.adoc#validateRemoveFrom[`validateRemoveFrom...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#addTo[`addTo...()`] and xref:refguide:applib-methods:prefixes.adoc#validateRemoveFrom[`validateRemoveFrom...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateRemoveFrom.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateRemoveFrom.adoc
index be1d4a3..3275d46 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/deprecated/validateRemoveFrom.adoc
@@ -41,5 +41,5 @@ public class LibraryMember {
----
-See also xref:refguide:applib-cm:methods.adoc#removeFrom[`removeFrom...()`] and xref:refguide:applib-cm:methods.adoc#validateAddTo[`validateAddTo...()`]`
+See also xref:refguide:applib-methods:prefixes.adoc#removeFrom[`removeFrom...()`] and xref:refguide:applib-methods:prefixes.adoc#validateAddTo[`validateAddTo...()`]`
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/disable.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/disable.adoc
similarity index 69%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/disable.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/disable.adoc
index 9d49bca..556e8a1 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/disable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/disable.adoc
@@ -12,92 +12,109 @@ For parameters, it disables the entry into the parameter; this is for actions wi
Typically modification/invocation is vetoed based on the state of the domain object being interacted with, though it could be any reason at all (eg the current date/time of the interaction, or the state of some other related data such as stock levels, or the identity of the calling user).
-
The reason for vetoing a modification/invocation is normally returned as a string.
However, Apache Isis' xref:userguide:btb:i18n.adoc[i18n support] extends this so that reasons can be internationalized.
-
-
The signature of the supporting method is generally:
[source,java]
----
-public String disableXxx() { /* ... */ }
+public String disableXxx() {
+ // ...
+}
----
where the returned string is the reason the property cannot be edited, or the action invoked.
-
For i18n, the supporting method returns a `TranslatableString`:
[source,java]
----
-public TranslatableString disableXxx() { /* ... */ }
+public TranslatableString disableXxx() {
+ // ...
+}
----
The returned string is then automatically translated to the locale of the current user.
-
To disable a property:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class Customer {
- public boolean isBlacklisted() { /* ... */ }
- public BigDecimal getCreditLimit() { /* ... */ }
- public void setCreditLimit(BigDecimal creditLimit) { /* ... */ }
+ @Getter @Setter
+ private boolean blacklisted;
+
+ @Getter @Setter
+ private BigDecimal creditLimit;
+
public String disableCreditLimit() {
return isBlacklisted()
? "Cannot change credit limit for blacklisted customers"
: null;
}
- ...
+
+ // ...
}
----
-
Or, to disable an action:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class Customer {
- public boolean isBlacklisted() { /* ... */ }
+ @Getter @Setter
+ private boolean blacklisted;
+
+ @Action
public Order placeOrder(
- final Product product,
- @ParameterLayout(named="Quantity")
- final int quantity) {
- ...
+ final Product product,
+ final int quantity) {
+ // ...
}
public String disablePlaceOrder() {
return isBlacklisted()
? "Blacklisted customers cannot place orders"
: null;
}
- ...
+
+ // ...
}
----
-
-[NOTE]
-====
-// TODO: v2: remove this feature, instead should fail-fast if there's a disableXxx() method with parameters.
-// Ditto for hideXxx().
-
-In the case of actions, the framework will also search for supporting method that has the exact same parameter types as the action itself.
-Enabling `isis.reflector.validator.noParamsOnly` configuration property switches this off, so that the framework will only search for supporting method with no parameters.
-====
-
-
It is also possible to disable an action parameter, so that it is disabled (greyed out) based on the value of earlier parameters.
For example:
[source,java]
----
-public Product categorize(Category category, Subcategory subcategory) { /* ... */}
-public String disable1Categorize(Category category) {
- return category == null category.hasSubcategories() ? null : "The selected category has no subcategories"
+public class ToDoItem {
+
+public class ToDoItem {
+
+ @Action(semantics = SemanticsOf.IDEMPOTENT)
+ @ActionLayout(
+ describedAs = "Update category and subcategory"
+ )
+ public Product categorize(
+ Category category,
+ Subcategory subcategory) {
+ // ...
+ }
+ public String disable1Categorize(Category category) {
+ return category == null || category.hasSubcategories()
+ ? null
+ : "The selected category has no subcategories";
+ }
+
+ // ...
}
----
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/get.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/get.adoc
similarity index 95%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/get.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/get.adoc
index 467a876..ea61cf5 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/get.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/get.adoc
@@ -14,5 +14,5 @@ All remaining `public` methods (that do not use one of the Apache Isis prefixes)
Any methods "left over" that _do_ use one of the Apache Isis prefixes, are interpreted to be orphaned. Apache Isis "fails-fast" and will not boot, instead printing an error message to the log so that the issue can be easily diagnosed.
-See also xref:refguide:applib-cm:methods.adoc#set[`set...()`].
+See also xref:refguide:applib-methods:prefixes.adoc#set[`set...()`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/hide.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/hide.adoc
similarity index 66%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/hide.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/hide.adoc
index 494135b..6818a0b 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/hide.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/hide.adoc
@@ -8,56 +8,66 @@
The `hide...()` supporting method is called for properties, collections, actions and action parameters.
It allows the property/collection to be completely hidden from view.
-It's comparatively rare for properties or collections to be imperatively hidden from view, but actions are sometimes hidden or shown visible (as opposed to being just xref:refguide:applib-cm:methods.adoc#disable[disabled], ie greyed out).
-
+It's comparatively rare for properties or collections to be imperatively hidden from view, but actions are sometimes hidden or shown visible (as opposed to being just xref:refguide:applib-methods:prefixes.adoc#disable[disabled], ie greyed out).
The signature of the supporting method is simply:
[source,java]
----
-public boolean hideXxx() { /* ... */ }
+public boolean hideXxx() {
+ // ...
+}
----
Returning `true` will hide the property, collection or action, returning `false` leaves it visible.
-
For example, to hide a property:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class Customer {
- public boolean isBlacklisted() { /* ... */ }
- public BigDecimal getCreditLimit() { /* ... */ }
- public void setCreditLimit(BigDecimal creditLimit) { /* ... */ }
+ @Getter @Setter
+ private boolean blacklisted;
+
+ @Getter @Setter
+ private BigDecimal creditLimit;
public boolean hideCreditLimit() {
return isBlacklisted();
}
- ...
+
+ // ...
}
----
-
Or, to hide an action:
[source,java]
----
+import lombok.Getter;
+import lombok.Setter;
+
public class Customer {
- public boolean isBlacklisted() { /* ... */ }
+
+ @Getter @Setter
+ private boolean blacklisted;
public Order placeOrder(
final Product product,
final int quantity) {
- ...
+ // ...
}
public boolean hidePlaceOrder() {
return isBlacklisted();
}
- ...
+
+ // ...
}
----
-
It is also possible to hide an action parameter, based on the value of some other earlier parameter:
Each `hideNXxx()` method can declare parameters for the previous N-1 parameters, though it need not declare them all.
@@ -72,13 +82,24 @@ public class Order {
String addressLine2,
String addressCity,
String addressPostalCode,
- String addressCountry
- ) { /* ... */ }
- public boolean hide1ShipTo(boolean sameAsBillingAddress) { return sameAsBillingAddress; }
- public boolean hide2ShipTo(boolean sameAsBillingAddress) { return sameAsBillingAddress; }
- public boolean hide3ShipTo(boolean sameAsBillingAddress) { return sameAsBillingAddress; }
- public boolean hide4ShipTo(boolean sameAsBillingAddress) { return sameAsBillingAddress; }
- public boolean hide5ShipTo(boolean sameAsBillingAddress) { return sameAsBillingAddress; }
+ String addressCountry ) {
+ // ...
+ }
+ public boolean hide1ShipTo(boolean same) {
+ return same;
+ }
+ public boolean hide2ShipTo(boolean same) {
+ return same;
+ }
+ public boolean hide3ShipTo(boolean same) {
+ return same;
+ }
+ public boolean hide4ShipTo(boolean same) {
+ return same;
+ }
+ public boolean hide5ShipTo(boolean same) {
+ return same;
+ }
}
----
@@ -86,11 +107,3 @@ In this case, the user can use the `shipTo(...)` action to specify where to ship
However, if they check the first boolean parameter (ie, to ship the `Order` to the billing address already held on file), then the remaining parameters will all be hidden.
-
-[NOTE]
-====
-In the case of actions, the framework will also search for supporting method that has the exact same parameter types as the action itself.
-Enabling `isis.reflector.validator.noParamsOnly` configuration property switches this off, so that the framework will only search for supporting method with no parameters.
-====
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/set.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/set.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/set.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/set.adoc
index ebde5a5..f0aac72 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/set.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/set.adoc
@@ -5,8 +5,6 @@
-
The `set...()` prefix is simply the normal JavaBean setter prefix that denotes writeable properties or collections.
-
-See also xref:refguide:applib-cm:methods.adoc#get[`get...()`].
+See also xref:refguide:applib-methods:prefixes.adoc#get[`get...()`].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved.adoc
similarity index 63%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved.adoc
index 3476e40..aa67f72 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved.adoc
@@ -13,34 +13,34 @@ The table below lists the reserved methods that are recognized as part of Apache
|Method
|Description
-|xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`]
+|xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`]
|Provides a CSS class for this object instance.
In conjunction with `static/css/application-css`, can therefore provide custom styling of an object instance wherever it is rendered.
-|xref:refguide:applib-cm:methods.adoc#disable[`disable(...)`]
-|Disable all or some of an object's properties
+//|xref:refguide:applib-methods:reserved.adoc#disable[`disable(...)`]
+//|Disable all or some of an object's properties
-|xref:refguide:applib-cm:methods.adoc#getId[`getId()`]
-|Provides an optional unique identifier of a service.
+//|xref:refguide:applib-methods:reserved.adoc#getId[`getId()`]
+//|Provides an optional unique identifier of a service.
+//
+//If not provided, the service's fully-qualified class name is used.
-If not provided, the service's fully-qualified class name is used.
+//|xref:refguide:applib-methods:reserved.adoc#hide[`hide(...)`]
+//|Hide all or some of an object's properties
-|xref:refguide:applib-cm:methods.adoc#reserved-hide[`hide(...)`]
-|Hide all or some of an object's properties
-
-|xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`]
+|xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`]
|Provides the name of the image to render, usually alongside the title, to represent the object.
If not provided, then the class name is used to locate an image.
-|xref:refguide:applib-cm:methods.adoc#layout[`layout()`]
+|xref:refguide:applib-methods:reserved.adoc#layout[`layout()`]
|Provides an alternative layout to use, if available.
If null or no such layout, then uses to the default layout.
-|xref:refguide:applib-cm:methods.adoc#title[`title()`]
+|xref:refguide:applib-methods:reserved.adoc#title[`title()`]
|Provides a title for the object. +
-|xref:refguide:applib-cm:methods.adoc#reserved-validate[`validate()`]
-|Validate the object's state prior to persisting.
+//|xref:refguide:applib-methods:reserved.adoc#validate[`validate()`]
+//|Validate the object's state prior to persisting.
|===
@@ -48,10 +48,10 @@ If null or no such layout, then uses to the default layout.
include::reserved/cssClass.adoc[leveloffset=+1]
-include::reserved/disable.adoc[leveloffset=+1]
-include::reserved/getId.adoc[leveloffset=+1]
-include::reserved/hide.adoc[leveloffset=+1]
+//include::reserved/disable.adoc[leveloffset=+1]
+//include::reserved/getId.adoc[leveloffset=+1]
+//include::reserved/hide.adoc[leveloffset=+1]
include::reserved/iconName.adoc[leveloffset=+1]
include::reserved/layout.adoc[leveloffset=+1]
include::reserved/title.adoc[leveloffset=+1]
-include::reserved/validate.adoc[leveloffset=+1]
+//include::reserved/validate.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/cssClass.adoc
similarity index 76%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/cssClass.adoc
index 21c5693..5bf10ed 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/cssClass.adoc
@@ -1,18 +1,17 @@
-[[cssclass]]
+[[cssClass]]
= `cssClass()`
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
The `cssClass()` returns a CSS class for a particular object instance.
The xref:vw:ROOT:about.adoc[Wicket viewer] wraps the object's representation in a containing `<div>` with the class added.
This is done both for rendering the object either in a table or when rendering the object on its own page.
-In conjunction with custom CSS (`static/css/application.css`), can therefore provide custom styling of an object instance wherever it is rendered.
+In conjunction with xref:refguide:config:application-specific/application-css.adoc[custom CSS] (usually CSS in the `static/css/application.css`), we can therefore provide custom styling of an object instance wherever it is rendered.
-For example, the http://github.com/apache/isis-app-todoapp[TodoApp] uses this technique to add a strikethrough for completed todo items.
+For example, in a todo app we can use this technique to add a strikethrough for completed todo items.
This is shown on the home page:
image::reference-methods/reserved/cssClass/strikethrough.png[width="800px",link="{imagesdir}/reference-methods/reserved/cssClass/strikethrough.png"]
@@ -46,6 +45,6 @@ tr.done {
See also:
-* xref:refguide:applib-cm:methods.adoc#title[`title()`]
-* xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`]
-* xref:refguide:applib-cm:methods.adoc#layout[`layout()`]
+* xref:refguide:applib-methods:reserved.adoc#title[`title()`]
+* xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`]
+* xref:refguide:applib-methods:reserved.adoc#layout[`layout()`]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/disable.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/disable.adoc
similarity index 91%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/disable.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/disable.adoc
index da66b91..a076730 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/disable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/disable.adoc
@@ -1,4 +1,4 @@
-[[reserved-disable]]
+[[disabled]]
= `disabled()`
: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 [...]
@@ -6,7 +6,7 @@
One use case that Apache Isis supports is that of a domain object with a lifecycle whereby at some stage it should become immutable: all its properties/collections should be disabled, and/or its actions become not invokable.
-It would be painful to have to write a separate xref:refguide:applib-cm:methods.adoc#reserved-disable[`disable...()`] method for each and every member, so instead Isis allows a single `disable...(...)` method to be implemented that is applied to all members.
+It would be painful to have to write a separate xref:refguide:applib-methods:prefixes.adoc#disable[`disable...()`] method for each and every member, so instead Isis allows a single `disable...(...)` method to be implemented that is applied to all members.
The signature of the method is:
@@ -30,7 +30,7 @@ public String disabled(Identifier.Type identifierType) {
}
----
-See also the similar methods to xref:refguide:applib-cm:methods.adoc#hide[`hide()`] object members en-masse.
+See also the similar methods to xref:refguide:applib-methods:prefixes.adoc#hide[`hide()`] object members en-masse.
== Alternatives
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/getId.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
similarity index 97%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/getId.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
index 1004e59..6403ae4 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/getId.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
@@ -37,7 +37,7 @@ public class OrderMenu {
The rules of precedence are:
1. xref:refguide:applib-ant:DomainService.adoc#objectType[`@DomainService#objectType()`]
-2. xref:refguide:applib-cm:methods.adoc#getId[`getId()`]
+2. xref:refguide:applib-methods:reserved.adoc#getId[`getId()`]
3. The fully qualified class name.
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/hide.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/hide.adoc
similarity index 80%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/hide.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/hide.adoc
index 8727ec3..7bee5a6 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/hide.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/hide.adoc
@@ -1,4 +1,4 @@
-[[reserved-hide]]
+[[hide]]
= `hide()`
: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 [...]
@@ -8,7 +8,7 @@
One use case that Apache Isis supports is that of a domain object with a lifecycle whereby at some stage some number of the object's members should be hidden.
For example, for an object that at some stage is logically immutable, we might want to make all its properties/collections unmodifiable and hide all its actions.
-While we could write a separate xref:refguide:applib-cm:methods.adoc#hide[`hide...()`] method for each and every action, this could become painful. So instead Isis allows a single `hide...(...)` method to be implemented that is applied to all members.
+While we could write a separate xref:refguide:applib-methods:prefixes.adoc#hide[`hide...()`] method for each and every action, this could become painful. So instead Isis allows a single `hide...(...)` method to be implemented that is applied to all members.
The signature of the method is:
@@ -28,12 +28,12 @@ public boolean hide(Identifier.Type identifierType) {
}
----
-See also the similar method to xref:refguide:applib-cm:methods.adoc#disable[`disable()`] object members en-masse.
+See also the similar method to xref:refguide:applib-methods:prefixes.adoc#disable[`disable()`] object members en-masse.
== Alternatives
An alternative design -- and one that could be easily argued is actually more flexible -- is to leverage domain events with vetoing subscribers.
-There is further discussion on this approach in xref:refguide:applib-cm:methods.adoc#disable[here].
+There is further discussion on this approach in xref:refguide:applib-methods:prefixes.adoc#disable[here].
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/validate.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/validate.adoc
similarity index 98%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/validate.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/validate.adoc
index 8e560e9..b43e00f 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/validate.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/validate.adoc
@@ -1,4 +1,4 @@
-[[reserved-validate]]
+[[validate]]
= `validate()`
: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 [...]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/iconName.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/iconName.adoc
similarity index 84%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/iconName.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/iconName.adoc
index a5e9908..8f6f3a1 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/iconName.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/iconName.adoc
@@ -13,7 +13,7 @@ The `iconName()` allows the icon that to be used to change for individual object
These are usually quite subtle, for example to reflect the particular status of an object.
The value returned by the `iconName()` method is added as a suffix to the base icon name.
-For example, the http://github.com/apache/isis-app-todoapp[TodoApp] uses this technique to add an overlay for todo items that have been completed:
+For example, in a todo app we can use this technique to add an overlay for todo items that have been completed:
image::reference-methods/reserved/iconName/differing.png[width="200px",link="{imagesdir}/reference-methods/reserved/iconName/differing.png"]
@@ -41,7 +41,7 @@ public class ToDoItem ... {
See also:
-* xref:refguide:applib-cm:methods.adoc#title[`title()`]
-* xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`]
-* xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`]
-* xref:refguide:applib-cm:methods.adoc#layout[`layout()`]
+* xref:refguide:applib-methods:reserved.adoc#title[`title()`]
+* xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`]
+* xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`]
+* xref:refguide:applib-methods:reserved.adoc#layout[`layout()`]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/layout.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
similarity index 80%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/layout.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
index 8b4b14c..758692d 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/layout.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
@@ -19,12 +19,12 @@ public class Customer {
@PropertyLayout(hidden=ALWAYS)
private String layout;
- public String layout() { // <1>
+ public String layout() { // <.>
return layout;
}
@ActionLayout(
- redirect=EVEN_IF_SAME // <2>
+ redirect=EVEN_IF_SAME // <.>
)
public Customer switchToEditMode() {
setLayout("edit");
@@ -32,8 +32,8 @@ public class Customer {
}
}
----
-<1> specifies the alternate layout to use, eg `Customer-edit.layout.xml`.
-<2> even though this action returns the same target object, still re-render the page.
+<.> specifies the alternate layout to use, eg `Customer-edit.layout.xml`.
+<.> even though this action returns the same target object, still re-render the page.
If `switchToEditMode()` action is invoked, then the UI will attempt to render the customer using a `Customer.layout.edit.xml` layout file (instead of the default `Customer.layout.xml`).
@@ -42,6 +42,6 @@ If `switchToEditMode()` action is invoked, then the UI will attempt to render th
See also:
-* xref:refguide:applib-cm:methods.adoc#title[`title()`]
-* xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`]
-* xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`]
+* xref:refguide:applib-methods:reserved.adoc#title[`title()`]
+* xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`]
+* xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`]
diff --git a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/title.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
similarity index 63%
rename from api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/title.adoc
rename to api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
index 3c129eb..e3814de 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/title.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
@@ -17,49 +17,44 @@ The signature of this method is usually:
[source,java]
----
-public String title() { /* ... */ }
+public String title() {
+ // ...
+}
----
Note that Apache Isis' xref:userguide:btb:i18n.adoc[i18n support] extends this so that titles can also be internationalized.
-For example, the http://github.com/apache/isis-app-todoapp[TodoApp] uses this technique to add an overlay for todo items that have been completed:
+For example, in a todoapp we can use this technique to change the title of items that have been completed:
[source,java]
----
public String title() {
- final TitleBuffer buf = new TitleBuffer(); // <1>
- buf.append(getDescription());
- if (isComplete()) { // <2>
- buf.append("- Completed!");
+ if (isComplete()) { // <.>
+ return getDescription() + "- Completed!");
} else {
- try {
- final LocalDate dueBy = wrapperFactory.wrap(this).getDueBy(); // <3>
- if (dueBy != null) {
- buf.append(" due by", dueBy);
- }
- } catch(final HiddenException ignored) { // <4>
+ final LocalDate dueBy = getDueBy();
+ if (dueBy != null) { // <.>
+ return getDescription() + " due by " + dueBy);
+ } else {
+ return getDescription();
}
}
- return buf.toString();
}
----
-<1> simple xref:refguide:applib-cm:classes.adoc#TitleBuffer[utility class] to help construct the title string
-<2> imperative conditional logic
-<3> using the xref:refguide:applib-svc:WrapperFactory.adoc[`WrapperFactory`] to determine if the `dueBy` field is visible for this user ...
-<4> ... but ignore if not
+<.> imperative conditional logic
+<.> imperative conditional logic
As the example above shows, the implementation can be as complex as you like.
In many cases, though, you may be able to use the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation.
-
-
+r
== See also
See also:
-* xref:refguide:applib-cm:methods.adoc#iconName[`iconName()`]
-* xref:refguide:applib-cm:methods.adoc#cssclass[`cssClass()`]
-* xref:refguide:applib-cm:methods.adoc#layout[`layout()`]
+* xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`]
+* xref:refguide:applib-methods:reserved.adoc#cssClass[`cssClass()`]
+* xref:refguide:applib-methods:reserved.adoc#layout[`layout()`]
diff --git a/api/applib/src/main/adoc/modules/applib-methods/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-methods/partials/module-nav.adoc
new file mode 100644
index 0000000..2c0c652
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-methods/partials/module-nav.adoc
@@ -0,0 +1,8 @@
+
+* xref:refguide:applib-methods:about.adoc[Methods]
+** xref:refguide:applib-methods:prefixes.adoc[Supporting Method Prefixes]
+** xref:refguide:applib-methods:reserved.adoc[Reserved Methods]
+** xref:refguide:applib-methods:lifecycle.adoc[Lifecycle Methods]
+
+
+
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
index 5544c91..ed4a634 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/AuditerService.adoc
@@ -66,5 +66,5 @@ As its name implies, it uses xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] to do th
The services provided by this module combines very well with the xref:refguide:applib-svc:CommandService.adoc[`CommandService`].
The `CommandService` captures the __cause__ of an interaction (an action was invoked, a property was edited), while the `AuditerService` captures the __effect__ of that interaction in terms of changed state.
You may also want to configure the xref:refguide:applib-svc:PublisherService.adoc[`PublisherService`], which also captures the effect of the interaction but as an event.
-All three of these services collaborate implicitly by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
+All three of these services collaborate implicitly by way of the xref:applib-classes:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
index 5818850..5e83704 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/CommandService.adoc
@@ -51,5 +51,5 @@ As discussed above, this service supports the xref:refguide:applib-svc:CommandCo
The services provided by this module combines very well with the xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`].
The `CommandService` captures the __cause__ of an interaction (an action was invoked, a property was edited), while the `AuditerService` captures the __effect__ of that interaction in terms of changed state.
You may also want to configure the xref:refguide:applib-svc:PublisherService.adoc[`PublisherService`], which also captures the effect of the interaction but as an event.
-All three of these services collaborate implicitly by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
+All three of these services collaborate implicitly by way of the xref:applib-classes:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
index 1549459..92aa45a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService.adoc
@@ -17,9 +17,9 @@ The SPI defined by this service is:
include::refguide:applib-svc:example$services/grid/GridLoaderService.java[tags="refguide"]
----
<.> whether dynamic reloading of layouts is enabled. The default implementation enables reloading for prototyping, disables in production
-<.> support metamodel invalidation/rebuilding of spec, eg as called by this xref:refguide:applib-cm:classes.adoc#rebuildMetamodel[Object mixin] action.
+<.> support metamodel invalidation/rebuilding of spec, eg as called by this xref:applib-classes:about.adoc#rebuildMetamodel[Object mixin] action.
<.> whether any persisted layout metadata (eg a `.layout.xml` file) exists for this domain class.
-<.> returns a new instance of a xref:refguide:applib-cm:classes/layout.adoc#component[`Grid`] for the specified domain class, eg as loaded from a `layout.xml` file.
+<.> returns a new instance of a xref:applib-classes:classes/layout.adoc#component[`Grid`] for the specified domain class, eg as loaded from a `layout.xml` file.
If none exists, will return null (and the calling xref:refguide:applib-svc:GridService.adoc[`GridService`] will use xref:refguide:applib-svc:GridSystemService.adoc[`GridSystemService`] to obtain a default grid for the domain class).
<.> Load a specific layout alternative, eg if specified through a `layout()` supporting method of the domain object itself.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
index b021c25..1823541 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/GridService.adoc
@@ -30,10 +30,10 @@ include::refguide:applib-svc:example$services/grid/GridService.java[tags="refgui
----
<.> whether dynamic reloading of layouts is enabled.
The default implementation enables reloading for prototyping, disables in production
-<.> support metamodel invalidation/rebuilding of spec, eg as called by this xref:refguide:applib-cm:classes.adoc#rebuildMetamodel[Object mixin] action.
+<.> support metamodel invalidation/rebuilding of spec, eg as called by this xref:applib-classes:about.adoc#rebuildMetamodel[Object mixin] action.
<.> whether any persisted layout metadata (eg a `.layout.xml` file) exists for this domain class.
Just delegates to corresponding method in xref:refguide:applib-svc:GridLoaderService.adoc[`GridLoaderService`].
-<.> returns a new instance of a xref:refguide:applib-cm:classes/layout.adoc#component[`Grid`] for the specified domain class, eg as loaded from a `layout.xml` file.
+<.> returns a new instance of a xref:applib-classes:classes/layout.adoc#component[`Grid`] for the specified domain class, eg as loaded from a `layout.xml` file.
If none exists, will return null (and the calling xref:refguide:applib-svc:GridService.adoc[`GridService`] will use xref:refguide:applib-svc:GridSystemService.adoc[`GridSystemService`] to obtain a default grid for the domain class).
<.> returns a layout alternative, eg if specified through a `layout()` supporting method of the domain object itself.
<.> returns a default grid, eg two columns in ratio 4:8.
@@ -60,5 +60,5 @@ The framework provides a default implementation of this service, namely `o.a.i.c
This service calls xref:refguide:applib-svc:GridLoaderService.adoc[`GridLoaderService`] and xref:refguide:applib-svc:GridSystemService.adoc[`GridSystemService`].
-This service is called by xref:refguide:applib-svc:LayoutService.adoc[`LayoutService`], exposed in the UI through `LayoutServiceMenu` (to download the layout XML as a zip file for all domain objects) and the xref:refguide:applib-cm:classes/mixins.adoc#Object[`downloadLayoutXml()`] mixin (to download the layout XML for a single domain
+This service is called by xref:refguide:applib-svc:LayoutService.adoc[`LayoutService`], exposed in the UI through `LayoutServiceMenu` (to download the layout XML as a zip file for all domain objects) and the xref:applib-classes:classes/mixins.adoc#Object[`downloadLayoutXml()`] mixin (to download the layout XML for a single domain
object).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
index 8aedb9a..884d2d3 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore.adoc
@@ -72,5 +72,5 @@ public class CustomerAndOrders implements HintStore.HintIdProvider {
== Related Services
-The xref:vw:ROOT:about.adoc[Wicket viewer] exposes the xref:refguide:applib-cm:classes.adoc#clearHints["clear hints"]
+The xref:vw:ROOT:about.adoc[Wicket viewer] exposes the xref:applib-classes:about.adoc#clearHints["clear hints"]
mixin action that is for use by end-users of the application to clear any UI hints that have accumulated for a domain object.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
index 42fe3fe..7ce52a6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext.adoc
@@ -21,7 +21,7 @@ Persistent``Interaction``s support several use cases:
* they enable profiling of the running application (which actions are invoked then most often, what is their response time)
* if auditing is configured (using xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`]), they provide better audit information, since the
-`Interaction.Execution` captures the 'cause' of an interaction and can be correlated to the audit records (the "effect" of the interaction) by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`transactionId`]
+`Interaction.Execution` captures the 'cause' of an interaction and can be correlated to the audit records (the "effect" of the interaction) by way of the xref:applib-classes:classes/mixins.adoc#HasUniqueId[`transactionId`]
== API
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
index 55c0ddc..117c21b 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService.adoc
@@ -36,5 +36,5 @@ Apache Isis provides a default implementation of the service, `o.a.i.applib.serv
This service is provided as a convenience for applications, but is also used internally by the framework to marshall xref:refguide:applib-ant:XmlRootElement.adoc[`@XmlRootElement`]-annotated
xref:userguide:fun:overview.adoc#view-models[view models].
-The functionality to download XML and XSD schemas is also exposed in the UI through mixins of the xref:refguide:applib-cm:classes/mixins.adoc#Dto[`Dto`] interface.
+The functionality to download XML and XSD schemas is also exposed in the UI through mixins of the xref:applib-classes:classes/mixins.adoc#Dto[`Dto`] interface.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
index 9ab7492..d27618b 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService.adoc
@@ -74,7 +74,7 @@ The framework provides a default implementation, `o.a.i.core.metamodel.services.
The service's functionality is exposed in the UI through a mixin (per object) and a menu action (for all objects):
-* the xref:refguide:applib-cm:classes/mixins.adoc#Object[`Object` mixin] provides the ability to download the XML layout for any domain object (entity or view model).
+* the xref:applib-classes:classes/mixins.adoc#Object[`Object` mixin] provides the ability to download the XML layout for any domain object (entity or view model).
* the `LayoutServiceMenu` provides the ability to download all XML layouts as a single ZIP file (in any of the three styles).
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
index 961b1a2..3dce0bc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService.adoc
@@ -4,7 +4,7 @@
:page-partial:
-The `MenuBarsLoaderService` is used by the default implementation of xref:refguide:applib-svc:MenuBarsService.adoc[MenuBarsService] to return a a xref:refguide:applib-cm:classes/menubars.adoc[`MenuBars`] instance deserialized from the `menubars.layout.xml` file read from the classpath.
+The `MenuBarsLoaderService` is used by the default implementation of xref:refguide:applib-svc:MenuBarsService.adoc[MenuBarsService] to return a a xref:applib-classes:classes/menubars.adoc[`MenuBars`] instance deserialized from the `menubars.layout.xml` file read from the classpath.
== SPI
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
index da10ba6..3cdd9c8 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService.adoc
@@ -6,7 +6,7 @@
WARNING: TODO - to review for v2.
-The `MenuBarsService` is responsible for returning a xref:refguide:applib-cm:classes/menubars.adoc[`MenuBars`] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
+The `MenuBarsService` is responsible for returning a xref:applib-classes:classes/menubars.adoc[`MenuBars`] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
This is used by the Wicket viewer to build up the menu, and is also served as the "menuBars" resource by the xref:vro:ROOT:about.adoc[Restful Objects] viewer.
== SPI
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
index 237ca11..0ea139d 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/PublisherService.adoc
@@ -130,7 +130,7 @@ To support these use cases several other services are involved:
The services provided by this module combine very well with the xref:refguide:applib-svc:CommandService.adoc[`CommandService`] and with xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`].
The `CommandService` captures the __cause__ of an interaction (an action was invoked, a property was edited), while the `PublisherService` captures the __effect__ of that interaction in terms of events, and the `AuditerService` captures the effect of the interaction in terms of changed state.
You may also want to configure the xref:refguide:applib-svc:PublisherService.adoc[`PublisherService`], which also captures the effect of the interaction but as an event.
-All three of these services collaborate implicitly by way of the xref:refguide:applib-cm:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
+All three of these services collaborate implicitly by way of the xref:applib-classes:classes/mixins.adoc#HasUniqueId[`HasUniqueId`] interface.
The xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] differs from the `PublisherService` in that it is intended for fine-grained publish/subscribe for object-to-object interactions within an Apache Isis domain object model.
The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event; it need not be serializable, for example.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
index 38f108d..6f22e65 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory.adoc
@@ -58,12 +58,12 @@ For domain objects (not mixins), the wrapper can be interacted with as follows:
Calling any of the above methods may result in a (subclass of) `InteractionException` if the object disallows it.
For example, if a property is annotated with xref:refguide:applib-ant:ActionLayout.adoc#hidden[`@ActionLayout#hidden`] then a `HiddenException` will be thrown.
-Similarly if an action has a xref:refguide:applib-cm:methods/prefixes/validate.adoc[`validateXxx()`] method and the supplied arguments are invalid then an `InvalidException` will be thrown.
+Similarly if an action has a xref:refguide:applib-methods:prefixes.adoc#validate[`validateXxx()`] method and the supplied arguments are invalid then an `InvalidException` will be thrown.
In addition, the following methods may also be called:
-* the xref:refguide:applib-cm:methods.adoc#title[`title()`] and `toString()` methods
-* any xref:refguide:applib-cm:methods.adoc#default[`default...()`], xref:refguide:applib-cm:methods.adoc#choices[`choices...()`] or xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`] methods
+* the xref:refguide:applib-methods:reserved.adoc#title[`title()`] and `toString()` methods
+* any xref:refguide:applib-methods:prefixes.adoc#default[`default...()`], xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`] or xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] methods
An exception will be thrown if any other methods are thrown.
@@ -73,7 +73,7 @@ If the interface is performed (action invoked or property set), then - irrespect
For mixins, the behaviour of the wrapper is similar but simpler.
Mixin wrappers only apply to actions, and so the wrapper will enforce the hidden/disable/validate rules before executing.
-In addition, any xref:refguide:applib-cm:methods.adoc#default[`default...()`], xref:refguide:applib-cm:methods.adoc#choices[`choices...()`] or xref:refguide:applib-cm:methods.adoc#autoComplete[`autoComplete...()`] methods can be called.
+In addition, any xref:refguide:applib-methods:prefixes.adoc#default[`default...()`], xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`] or xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] methods can be called.
==== `SyncControl`
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
index 39e57e4..4720ec9 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
@@ -87,7 +87,7 @@ public class Customer {
For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.
-For transient objects (instantiated programmatically), the xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#instantiate(...)`] or the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#instantiate(...)`]'s will automatically inject the services.
+For transient objects (instantiated programmatically), the xref:refguide:applib-svc:FactoryService.adoc[`FactoryService#create(...)`] or the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]'s will automatically inject the services.
Alternatively the object can be instantiated simply using `new`, then services injected using xref:refguide:applib-svc:ServiceRegistry.adoc[`ServiceRegistry`]'s ``injectServicesInto(...)`` method.
@@ -160,7 +160,7 @@ But, if the action/property is to be executed in the foreground, then the intera
* the (request-scoped) xref:refguide:applib-svc:InteractionContext.adoc[`InteractionContext`] domain service acts as a factory for the ``Interaction`` object, which keeps track of the call-graph of executions (``Interaction.Execution``) of either action invocations or property edits.
In the majority of cases there is likely to be just a single top-level node of this graph, but for applications that use the xref:refguide:applib-svc:WrapperFactory.adoc[`WrapperFactory`] extensively each successive call results in a new child execution.
-* before and after each action invocation/property edit, a xref:refguide:applib-cm:classes/domainevent.adoc[domain event] is may be broadcast to all subscribers.
+* before and after each action invocation/property edit, a xref:applib-classes:classes/domainevent.adoc[domain event] is may be broadcast to all subscribers.
Whether this occurs depends on whether the action/property has been annotated (using xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()`] or xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`]).
+
(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).
diff --git a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
index dec3109..f2723ba 100644
--- a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
+++ b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
@@ -150,7 +150,7 @@ It's important that a wrapper class is used (ie `java.lang.Integer`, not `int`)
<6> the mandatory execute(...) API
<7> the `defaultParam(...)` (inherited from `FixtureScript`) will default the `number` property (using Java's Reflection API) if none was specified
<8> call another fixture script (`SimpleObjectsTearDown`) using the provided `ExecutionContext`.
-Note that although the fixture script is a view model, it's fine to simply instantiate it (rather than using `FactoryService#instantiate(...)`).
+Note that although the fixture script is a view model, it's fine to simply instantiate it (rather than using `FactoryService#create(...)`).
<9> calling another fixture script (`SimpleObjectCreate`) using the provided `ExecutionContext`
<10> adding the created object to the list, for the calling object to use.